From owner-p4-projects@FreeBSD.ORG  Mon Oct 20 13:43:25 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4D94116A4C0; Mon, 20 Oct 2003 13:43:25 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 27B9416A4B3
	for <perforce@freebsd.org>; Mon, 20 Oct 2003 13:43:25 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id A517743FAF
	for <perforce@freebsd.org>; Mon, 20 Oct 2003 13:43:24 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id h9KKhOXJ087916
	for <perforce@freebsd.org>; Mon, 20 Oct 2003 13:43:24 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id h9KKhOgQ087913
	for perforce@freebsd.org; Mon, 20 Oct 2003 13:43:24 -0700 (PDT)
	(envelope-from sam@freebsd.org)
Date: Mon, 20 Oct 2003 13:43:24 -0700 (PDT)
Message-Id: <200310202043.h9KKhOgQ087913@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 40019 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Oct 2003 20:43:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=40019

Change 40019 by sam@sam_ebb on 2003/10/20 13:43:04

	IFC linux build fix

Affected files ...

.. //depot/projects/netperf/sys/compat/linux/linux_ioctl.c#3 integrate

Differences ...

==== //depot/projects/netperf/sys/compat/linux/linux_ioctl.c#3 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.110 2003/10/20 09:51:00 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ioctl.c,v 1.111 2003/10/20 17:56:10 sam Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1092,18 +1092,6 @@
 }
 
 static void
-linux_to_bsd_msf_lba(u_char af, union linux_cdrom_addr *lp, union msf_lba *bp)
-{
-	if (af == CD_LBA_FORMAT)
-		bp->lba = lp->lba;
-	else {
-		bp->msf.minute = lp->msf.minute;
-		bp->msf.second = lp->msf.second;
-		bp->msf.frame = lp->msf.frame;
-	}
-}
-
-static void
 set_linux_cdrom_addr(union linux_cdrom_addr *addr, int format, int lba)
 {
 	if (format == LINUX_CDROM_MSF) {