PERFORCE change 133828 for review

Kip Macy kmacy at FreeBSD.org
Mon Jan 21 15:40:30 PST 2008


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

Change 133828 by kmacy at kmacy:storage:toehead on 2008/01/21 23:39:27

	IFC 133824

Affected files ...

.. //depot/projects/toehead/Makefile.inc1#3 integrate
.. //depot/projects/toehead/UPDATING#2 integrate
.. //depot/projects/toehead/etc/defaults/rc.conf#3 integrate
.. //depot/projects/toehead/etc/rc.firewall#3 integrate
.. //depot/projects/toehead/lib/msun/src/k_rem_pio2.c#3 integrate
.. //depot/projects/toehead/lib/msun/src/k_rem_pio2f.c#3 delete
.. //depot/projects/toehead/lib/msun/src/s_log1pf.c#3 integrate
.. //depot/projects/toehead/release/doc/share/misc/dev.archlist.txt#3 integrate
.. //depot/projects/toehead/release/fixit.profile#2 integrate
.. //depot/projects/toehead/sbin/ipfw/ipfw2.c#3 integrate
.. //depot/projects/toehead/share/man/man4/axe.4#2 integrate
.. //depot/projects/toehead/share/man/man4/sf.4#2 integrate
.. //depot/projects/toehead/share/man/man4/vlan.4#2 integrate
.. //depot/projects/toehead/share/man/man7/ports.7#3 integrate
.. //depot/projects/toehead/sys/compat/freebsd32/freebsd32_proto.h#3 integrate
.. //depot/projects/toehead/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate
.. //depot/projects/toehead/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate
.. //depot/projects/toehead/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate
.. //depot/projects/toehead/sys/compat/freebsd32/syscalls.master#3 integrate
.. //depot/projects/toehead/sys/conf/files#5 integrate
.. //depot/projects/toehead/sys/dev/sf/if_sf.c#1 branch
.. //depot/projects/toehead/sys/dev/sf/if_sfreg.h#1 branch
.. //depot/projects/toehead/sys/dev/sf/starfire_rx.h#1 branch
.. //depot/projects/toehead/sys/dev/sf/starfire_tx.h#1 branch
.. //depot/projects/toehead/sys/fs/coda/coda_vnops.c#4 integrate
.. //depot/projects/toehead/sys/kern/init_sysent.c#3 integrate
.. //depot/projects/toehead/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/toehead/sys/kern/syscalls.c#3 integrate
.. //depot/projects/toehead/sys/kern/syscalls.master#3 integrate
.. //depot/projects/toehead/sys/kern/systrace_args.c#3 integrate
.. //depot/projects/toehead/sys/modules/sf/Makefile#2 integrate
.. //depot/projects/toehead/sys/netinet6/in6_src.c#4 integrate
.. //depot/projects/toehead/sys/pci/amdsmb.c#2 integrate
.. //depot/projects/toehead/sys/pci/if_sf.c#2 delete
.. //depot/projects/toehead/sys/pci/if_sfreg.h#2 delete
.. //depot/projects/toehead/sys/pci/nfsmb.c#2 integrate
.. //depot/projects/toehead/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/toehead/sys/sys/syscall.h#3 integrate
.. //depot/projects/toehead/sys/sys/syscall.mk#3 integrate
.. //depot/projects/toehead/sys/sys/sysproto.h#3 integrate
.. //depot/projects/toehead/sys/sys/user.h#2 integrate
.. //depot/projects/toehead/tools/build/Makefile#2 integrate
.. //depot/projects/toehead/usr.bin/mt/mt.1#2 integrate
.. //depot/projects/toehead/usr.bin/procstat/procstat_files.c#3 integrate

Differences ...

==== //depot/projects/toehead/Makefile.inc1#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.592 2008/01/16 15:05:49 brueffer Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.593 2008/01/21 18:44:54 obrien Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -841,10 +841,6 @@
 # legacy: Build compatibility shims for the next three targets
 #
 legacy:
-.if ${BOOTSTRAPPING} < 503000
-	@echo "ERROR: Source upgrades from versions prior to 5.3 not supported."; \
-	false
-.endif
 .for _tool in tools/build
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \
 	    cd ${.CURDIR}/${_tool}; \
@@ -871,26 +867,6 @@
 .endif
 .endif
 
-.if ${BOOTSTRAPPING} < 600029
-_texinfo=	gnu/usr.bin/texinfo
-.endif
-
-.if ${BOOTSTRAPPING} < 600015
-_cap_mkdb=	usr.bin/cap_mkdb
-.endif
-
-.if ${BOOTSTRAPPING} < 600018
-_colldef=	usr.bin/colldef
-.endif
-
-.if ${BOOTSTRAPPING} < 600017
-_gencat=	usr.bin/gencat
-.endif
-
-.if ${BOOTSTRAPPING} < 600016
-_mklocale=	usr.bin/mklocale
-.endif
-
 .if ${BOOTSTRAPPING} < 700018
 _gensnmptree=	usr.sbin/bsnmpd/gensnmptree
 .endif
@@ -900,10 +876,6 @@
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
-.if ${BOOTSTRAPPING} < 600020
-_pwd_mkdb=	usr.sbin/pwd_mkdb
-.endif
-
 bootstrap-tools:
 .for _tool in \
     ${_strfile} \

==== //depot/projects/toehead/UPDATING#2 (text+ko) ====

@@ -21,6 +21,14 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20080121:
+	To upgrade to -current after this date, you must be running
+	FreeBSD after the RELENG_6 branch point.  This means any of the
+	6.x releases are supported and should work.  Upgrading to current
+	from 5.x now requires a stop over at RELENG_6 or RELENG_7 systems.
+	FreeBSD_version must be 600029 or higher, although this isn't
+	enforced in the Makefile at this time.
+
 20071128:
 	The ADAPTIVE_GIANT kernel option has been retired because its
 	functionality is the default now.
@@ -949,4 +957,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.513 2007/11/28 13:04:11 matteo Exp $
+$FreeBSD: src/UPDATING,v 1.514 2008/01/21 22:04:37 imp Exp $

==== //depot/projects/toehead/etc/defaults/rc.conf#3 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.322 2008/01/12 20:52:30 maxim Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.323 2008/01/21 04:41:18 rafan Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -119,6 +119,9 @@
 firewall_nologports="135-139,445 1026,1027 1433,1434" # List of TCP/UDP ports
 				#  for which denied incoming packets are not
 				#  logged.
+firewall_nat_enable="NO"	# Enable kernel NAT (if firewall_enable == YES)
+firewall_nat_interface=""	# Public interface or IPaddress to use
+firewall_nat_flags=""		# Additional configuration parameters
 ip_portrange_first="NO"		# Set first dynamically allocated port
 ip_portrange_last="NO"		# Set last dynamically allocated port
 ike_enable="NO"			# Enable IKE daemon (usually racoon or isakmpd)

==== //depot/projects/toehead/etc/rc.firewall#3 (text+ko) ====

@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/etc/rc.firewall,v 1.53 2008/01/12 19:02:09 maxim Exp $
+# $FreeBSD: src/etc/rc.firewall,v 1.54 2008/01/21 04:41:17 rafan Exp $
 #
 
 #
@@ -131,7 +131,13 @@
 	case ${firewall_nat_enable} in
 	[Yy][Ee][Ss])
 		if [ -n "${firewall_nat_interface}" ]; then
-			${fwcmd} nat 123 config if ${firewall_nat_interface} log
+			if echo "${firewall_nat_interface}" | \
+				grep -q -E '^[0-9]+(\.[0-9]+){0,3}$'; then
+				firewall_nat_flags="ip ${firewall_nat_interface} ${firewall_nat_flags}"
+			else
+				firewall_nat_flags="if ${firewall_nat_interface} ${firewall_nat_flags}"
+			fi
+			${fwcmd} nat 123 config log ${firewall_nat_flags}
 			${fwcmd} add 50 nat 123 ip4 from any to any via ${firewall_nat_interface}
 		fi
 		;;

==== //depot/projects/toehead/lib/msun/src/k_rem_pio2.c#3 (text+ko) ====

@@ -12,7 +12,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.8 2008/01/19 20:02:55 bde Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/k_rem_pio2.c,v 1.9 2008/01/20 04:09:44 bde Exp $");
 
 /*
  * __kernel_rem_pio2(x,y,e0,nx,prec,ipio2)
@@ -278,7 +278,7 @@
 	    case 2:
 		fw = 0.0;
 		for (i=jz;i>=0;i--) fw += fq[i]; 
-		STRICT_ASSIGN(float,fw,fw);
+		STRICT_ASSIGN(double,fw,fw);
 		y[0] = (ih==0)? fw: -fw; 
 		fw = fq[0]-fw;
 		for (i=1;i<=jz;i++) fw += fq[i];

==== //depot/projects/toehead/lib/msun/src/s_log1pf.c#3 (text+ko) ====

@@ -14,7 +14,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/s_log1pf.c,v 1.10 2008/01/19 18:13:21 bde Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_log1pf.c,v 1.11 2008/01/21 13:46:21 bde Exp $");
 
 #include <float.h>
 
@@ -50,9 +50,9 @@
 		if(x==(float)-1.0) return -two25/zero; /* log1p(-1)=+inf */
 		else return (x-x)/(x-x);	/* log1p(x<-1)=NaN */
 	    }
-	    if(ax<0x31000000) {			/* |x| < 2**-29 */
+	    if(ax<0x38000000) {			/* |x| < 2**-15 */
 		if(two25+x>zero			/* raise inexact */
-	            &&ax<0x24800000) 		/* |x| < 2**-54 */
+	            &&ax<0x33800000) 		/* |x| < 2**-24 */
 		    return x;
 		else
 		    return x - x*x*(float)0.5;

==== //depot/projects/toehead/release/doc/share/misc/dev.archlist.txt#3 (text+ko) ====

@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.101 2007/12/16 13:14:47 bmah Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.102 2008/01/21 09:00:09 brueffer Exp $
 #
 
 #
@@ -109,7 +109,6 @@
 rum	i386,amd64
 safe	i386,pc98,amd64
 sbp	i386,sparc64,ia64,amd64
-sf	i386,pc98,ia64,amd64
 sis	i386,pc98,ia64,amd64
 sk	i386,sparc64,pc98,amd64
 sn	i386,amd64

==== //depot/projects/toehead/release/fixit.profile#2 (text+ko) ====

@@ -1,10 +1,10 @@
 :
-# $FreeBSD: src/release/fixit.profile,v 1.11 2007/12/06 20:25:31 lulf Exp $
+# $FreeBSD: src/release/fixit.profile,v 1.12 2008/01/21 17:25:48 kensmith Exp $
 
 export BLOCKSIZE=K
 export PS1="Fixit# "
-export EDITOR="/mnt2/stand/vi"
-export PAGER="/mnt2/stand/more"
+export EDITOR="/mnt2/rescue/vi"
+export PAGER="/mnt2/usr/bin/more"
 export SCSI_MODES="/mnt2/usr/share/misc/scsi_modes"
 # the root MFS doesn't have /dev/nrsa0, pick a better default for mt(1)
 export TAPE=/mnt2/dev/nrsa0

==== //depot/projects/toehead/sbin/ipfw/ipfw2.c#3 (text+ko) ====

@@ -17,7 +17,7 @@
  *
  * NEW command line interface for IP firewall facility
  *
- * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.111 2007/12/17 10:25:56 oleg Exp $
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.112 2008/01/20 08:31:35 maxim Exp $
  */
 
 #include <sys/param.h>
@@ -3994,6 +3994,8 @@
 			ac--; av++;
 			break;	    
 		case TOK_IF:
+			if (ac == 0) 
+				errx(EX_DATAERR, "missing option");
 			set_addr_dynamic(av[0], n);
 			ac--; av++;
 			break;

==== //depot/projects/toehead/share/man/man4/axe.4#2 (text+ko) ====

@@ -28,14 +28,14 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/axe.4,v 1.14 2007/06/06 19:27:10 remko Exp $
+.\" $FreeBSD: src/share/man/man4/axe.4,v 1.15 2008/01/21 04:13:00 sam Exp $
 .\"
-.Dd June 6, 2007
+.Dd January 20, 2008
 .Dt AXE 4
 .Os
 .Sh NAME
 .Nm axe
-.Nd "ASIX Electronics AX88172 USB Ethernet driver"
+.Nd "ASIX Electronics AX88172/178/772 USB Ethernet driver"
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following lines in your
@@ -59,19 +59,21 @@
 The
 .Nm
 driver provides support for USB Ethernet adapters based on the ASIX
-Electronics AX88172 USB 2.0 chipset.
+Electronics AX88172, AX88178 and AX88772 USB 2.0 chipsets.
 .Pp
-The AX88172 is a USB 2.0 device which contains a 10/100
-Ethernet MAC with MII interface and is designed to work with both
+The AX88172 and AX88178 are USB 2.0 devices that contain a 10/100
+Ethernet MAC with MII interface and are designed to work with both
 Ethernet and HomePNA transceivers.
-The AX88172 will operate with
+The AX88772 will additionally support 10/100/1000 MACs.
+.Pp
+These devices will operate with
 both USB 1.x and USB 2.0 controllers, however performance with 1.x
 controllers will be limited since the USB 1.x standard specifies a
 maximum transfer speed of 12Mbps.
 Users with USB 1.x controllers should therefore not expect to actually
 achieve 100Mbps speeds with these devices.
 .Pp
-The AX88172 supports a 64-bit multicast hash table, single perfect
+All chipsets support a 64-bit multicast hash table, single perfect
 filter entry for the station address, all-multicast mode and promiscuous mode.
 Packets are
 received and transmitted over separate USB bulk transfer endpoints.
@@ -127,14 +129,31 @@
 .Sh HARDWARE
 The
 .Nm
-driver supports ASIX Electronics AX88172 based USB Ethernet
+driver supports ASIX Electronics AX88172/AX88178/AX88772 based USB Ethernet
 adapters including:
 .Pp
+AX88172:
 .Bl -bullet -compact
 .It
+AboCom UF200
+.It
+Acer Communications EP1427X2
+.It
+ATen UC210T
+.It
+Billionton SnapPort
+.It
+Billionton USB2AR
+.It
 Buffalo (Melco Inc.) LUA-U2-KTX
 .It
-D-Link DUB-E100, revision A
+Corega USB2_TX
+.It
+D-Link DUBE100
+.It
+Goodway GWUSB2E
+.It
+JVC MP_PRX1
 .It
 LinkSys USB200M
 .It
@@ -144,6 +163,24 @@
 .It
 System TALKS Inc.\& SGC-X2UL
 .El
+.Pp
+AX88178:
+.Bl -bullet -compact
+.It
+Belkin F5D5055
+.It
+Planex Communications GU1000T
+.It
+Sitecom Europe LN-028
+.El
+.Pp
+AX88772:
+.Bl -bullet -compact
+.It
+Cisco-Linksys USB200Mv2
+.It
+D-Link DUBE100B1
+.El
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "axe%d: watchdog timeout"
@@ -161,7 +198,7 @@
 .Xr ng_ether 4 ,
 .Xr ifconfig 8
 .Rs
-.%T "ASIX AX88172 data sheet"
+.%T "ASIX AX88172 AX88178 and AX88772 data sheets"
 .%O http://www.asix.com.tw
 .Re
 .Sh HISTORY

==== //depot/projects/toehead/share/man/man4/sf.4#2 (text+ko) ====

@@ -28,9 +28,9 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/sf.4,v 1.24 2007/01/30 08:40:04 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/sf.4,v 1.25 2008/01/21 07:35:15 yongari Exp $
 .\"
-.Dd July 16, 2005
+.Dd January 21, 2008
 .Dt SF 4
 .Os
 .Sh NAME
@@ -139,6 +139,23 @@
 .It
 ANA-62020 64-bit single port 100baseFX adapter
 .El
+.Sh SYSCTL VARIABLES
+The following variables are available as both
+.Xr sysctl 8
+variables and
+.Xr loader 8
+tunables:
+.Bl -tag -width indent
+.It Va dev.sf.%d.int_mod
+Maximum amount of time to delay interrupt processing in units of
+102.4us.
+The accepted range is 0 to 31, the default value is 1 (102.4us).
+Value 0 completely disables the interrupt moderation.
+The interface does not need to be brought down and up again before
+a change takes effect.
+.It Va dev.sf.%d.stats
+Display lots of useful MAC counters maintained in the driver.
+.El
 .Sh DIAGNOSTICS
 .Bl -diag
 .It "sf%d: couldn't map memory"
@@ -176,6 +193,7 @@
 .Xr netintro 4 ,
 .Xr ng_ether 4 ,
 .Xr polling 4 ,
+.Xr vlan 4 ,
 .Xr ifconfig 8
 .Rs
 .%T The Adaptec AIC-6915 Programmer's Manual

==== //depot/projects/toehead/share/man/man4/vlan.4#2 (text+ko) ====

@@ -23,9 +23,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.44 2007/05/09 09:02:11 yar Exp $
+.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.45 2008/01/21 06:47:20 yongari Exp $
 .\"
-.Dd May 7, 2007
+.Dd January 21, 2008
 .Dt VLAN 4
 .Os
 .Sh NAME
@@ -166,6 +166,7 @@
 .Xr nfe 4 ,
 .Xr nve 4 ,
 .Xr rl 4 ,
+.Xr sf 4 ,
 .Xr sis 4 ,
 .Xr sk 4 ,
 .Xr ste 4 ,

==== //depot/projects/toehead/share/man/man7/ports.7#3 (text+ko) ====

@@ -23,9 +23,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man7/ports.7,v 1.64 2007/12/21 21:48:54 gabor Exp $
+.\" $FreeBSD: src/share/man/man7/ports.7,v 1.65 2008/01/21 19:52:15 brueffer Exp $
 .\"
-.Dd Dec 21, 2007
+.Dd January 21, 2008
 .Dt PORTS 7
 .Os
 .Sh NAME
@@ -336,6 +336,8 @@
 Generate a one-line description of each port for use in the
 .Pa INDEX
 file.
+.It Cm maintainer
+Display the port maintainer's email address.
 .It Cm index
 Create
 .Pa /usr/ports/INDEX ,

==== //depot/projects/toehead/sys/compat/freebsd32/freebsd32_proto.h#3 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.80 2008/01/08 22:01:25 jhb Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp 
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.81 2008/01/20 23:44:24 rwatson Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.95 2008/01/20 23:43:06 rwatson Exp 
  */
 
 #ifndef _FREEBSD32_SYSPROTO_H_

==== //depot/projects/toehead/sys/compat/freebsd32/freebsd32_syscall.h#3 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.78 2008/01/08 22:01:25 jhb Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp 
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.79 2008/01/20 23:44:24 rwatson Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.95 2008/01/20 23:43:06 rwatson Exp 
  */
 
 #define	FREEBSD32_SYS_syscall	0

==== //depot/projects/toehead/sys/compat/freebsd32/freebsd32_syscalls.c#3 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.69 2008/01/08 22:01:25 jhb Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp 
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.70 2008/01/20 23:44:24 rwatson Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.95 2008/01/20 23:43:06 rwatson Exp 
  */
 
 const char *freebsd32_syscallnames[] = {

==== //depot/projects/toehead/sys/compat/freebsd32/freebsd32_sysent.c#3 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.79 2008/01/08 22:01:25 jhb Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp 
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.80 2008/01/20 23:44:24 rwatson Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.95 2008/01/20 23:43:06 rwatson Exp 
  */
 
 #include "opt_compat.h"
@@ -521,6 +521,6 @@
 	{ AS(freebsd32_truncate_args), (sy_call_t *)freebsd32_truncate, AUE_TRUNCATE, NULL, 0, 0 },	/* 479 = freebsd32_truncate */
 	{ AS(freebsd32_ftruncate_args), (sy_call_t *)freebsd32_ftruncate, AUE_FTRUNCATE, NULL, 0, 0 },	/* 480 = freebsd32_ftruncate */
 	{ AS(thr_kill2_args), (sy_call_t *)thr_kill2, AUE_KILL, NULL, 0, 0 },	/* 481 = thr_kill2 */
-	{ AS(shm_open_args), (sy_call_t *)shm_open, AUE_NULL, NULL, 0, 0 },	/* 482 = shm_open */
-	{ AS(shm_unlink_args), (sy_call_t *)shm_unlink, AUE_NULL, NULL, 0, 0 },	/* 483 = shm_unlink */
+	{ AS(shm_open_args), (sy_call_t *)shm_open, AUE_SHMOPEN, NULL, 0, 0 },	/* 482 = shm_open */
+	{ AS(shm_unlink_args), (sy_call_t *)shm_unlink, AUE_SHMUNLINK, NULL, 0, 0 },	/* 483 = shm_unlink */
 };

==== //depot/projects/toehead/sys/compat/freebsd32/syscalls.master#3 (text+ko) ====

@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.94 2008/01/08 21:58:14 jhb Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.95 2008/01/20 23:43:06 rwatson Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;	from: src/sys/kern/syscalls.master 1.107
 ;
@@ -796,6 +796,6 @@
 480	AUE_FTRUNCATE	STD	{ int freebsd32_ftruncate(int fd, \
 				    u_int32_t lengthlo, u_int32_t lengthhi); }
 481	AUE_KILL	NOPROTO	{ int thr_kill2(pid_t pid, long id, int sig); }
-482	AUE_NULL	NOPROTO	{ int shm_open(const char *path, int flags, \
+482	AUE_SHMOPEN	NOPROTO	{ int shm_open(const char *path, int flags, \
 				    mode_t mode); }
-483	AUE_NULL	NOPROTO	{ int shm_unlink(const char *path); }
+483	AUE_SHMUNLINK	NOPROTO	{ int shm_unlink(const char *path); }

==== //depot/projects/toehead/sys/conf/files#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1264 2008/01/15 20:34:47 gallatin Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1265 2008/01/21 04:27:31 yongari Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -937,6 +937,7 @@
 dev/scc/scc_dev_z8530.c		optional scc
 dev/scd/scd.c			optional scd isa
 dev/scd/scd_isa.c		optional scd isa
+dev/sf/if_sf.c			optional sf pci
 dev/si/si.c			optional si
 dev/si/si2_z280.c		optional si
 dev/si/si3_t225.c		optional si
@@ -2020,7 +2021,6 @@
 pci/if_mn.c			optional mn pci
 pci/if_pcn.c			optional pcn pci
 pci/if_rl.c			optional rl pci
-pci/if_sf.c			optional sf pci
 pci/if_sis.c			optional sis pci
 pci/if_ste.c			optional ste pci
 pci/if_tl.c			optional tl pci

==== //depot/projects/toehead/sys/fs/coda/coda_vnops.c#4 (text+ko) ====

@@ -42,7 +42,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vnops.c,v 1.83 2008/01/19 17:12:44 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/fs/coda/coda_vnops.c,v 1.85 2008/01/21 21:39:08 rwatson Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -341,7 +341,9 @@
 	opened_internally = 1;
 	MARK_INT_GEN(CODA_OPEN_STATS);
 	error = VOP_OPEN(vp, (rw == UIO_READ ? FREAD : FWRITE), cred, td, NULL);
+#ifdef CODA_VERBOSE
 	printf("coda_rdwr: Internally Opening %p\n", vp);
+#endif
 	if (error) {
 		printf("coda_rdwr: VOP_OPEN on container failed %d\n", error);
 		return (error);
@@ -926,19 +928,14 @@
 	     * lock it without bothering to check anything else. 
 	     */
 	    if (*ap->a_vpp) {
-		if ((error = VOP_LOCK(*ap->a_vpp, LK_EXCLUSIVE))) {
-		    vn_lock(dvp, LK_RETRY|LK_EXCLUSIVE);
-		    return (error);
-		}
+		vn_lock(*ap->a_vpp, LK_EXCLUSIVE | LK_RETRY);
 	    }
 	    vn_lock(dvp, LK_RETRY|LK_EXCLUSIVE);
 	} else {
 	    /* The parent is locked, and may be the same as the child */
 	    if (*ap->a_vpp && (*ap->a_vpp != dvp)) {
 		/* Different, go ahead and lock it. */
-		if ((error = VOP_LOCK(*ap->a_vpp, LK_EXCLUSIVE))) {
-		    return (error);
-		}
+		vn_lock(*ap->a_vpp, LK_EXCLUSIVE | LK_RETRY);
 	    }
 	}
     } else {
@@ -1022,10 +1019,7 @@
 
     if (!error) {
 	if (cnp->cn_flags & LOCKLEAF) {
-	    if ((error = VOP_LOCK(*ap->a_vpp, LK_EXCLUSIVE))) {
-		printf("coda_create: ");
-		panic("unlocked parent but couldn't lock child");
-	    }
+	    vn_lock(*ap->a_vpp, LK_EXCLUSIVE | LK_RETRY);
 	}
 #ifdef OLD_DIAGNOSTIC
 	else {
@@ -1289,9 +1283,7 @@
 	/* Invalidate the parent's attr cache, the modification time has changed */
 	VTOC(dvp)->c_flags &= ~C_VATTR;
 
-	if ((error = VOP_LOCK(*vpp, LK_EXCLUSIVE))) {
-	    panic("coda_create: couldn't lock child");
-	}
+	vn_lock(*vpp, LK_EXCLUSIVE | LK_RETRY);
 
 	CODADEBUG( CODA_MKDIR, myprintf(("mkdir: %s result %d\n",
 					 coda_f2s(&VFid), error)); )

==== //depot/projects/toehead/sys/kern/init_sysent.c#3 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call switch table.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/init_sysent.c,v 1.231 2008/01/08 22:01:25 jhb Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.235 2008/01/08 21:58:15 jhb Exp 
+ * $FreeBSD: src/sys/kern/init_sysent.c,v 1.232 2008/01/20 23:44:23 rwatson Exp $
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.236 2008/01/20 23:43:06 rwatson Exp 
  */
 
 #include "opt_compat.h"
@@ -511,6 +511,6 @@
 	{ AS(truncate_args), (sy_call_t *)truncate, AUE_TRUNCATE, NULL, 0, 0 },	/* 479 = truncate */
 	{ AS(ftruncate_args), (sy_call_t *)ftruncate, AUE_FTRUNCATE, NULL, 0, 0 },	/* 480 = ftruncate */
 	{ AS(thr_kill2_args), (sy_call_t *)thr_kill2, AUE_KILL, NULL, 0, 0 },	/* 481 = thr_kill2 */
-	{ AS(shm_open_args), (sy_call_t *)shm_open, AUE_NULL, NULL, 0, 0 },	/* 482 = shm_open */
-	{ AS(shm_unlink_args), (sy_call_t *)shm_unlink, AUE_NULL, NULL, 0, 0 },	/* 483 = shm_unlink */
+	{ AS(shm_open_args), (sy_call_t *)shm_open, AUE_SHMOPEN, NULL, 0, 0 },	/* 482 = shm_open */
+	{ AS(shm_unlink_args), (sy_call_t *)shm_unlink, AUE_SHMUNLINK, NULL, 0, 0 },	/* 483 = shm_unlink */
 };

==== //depot/projects/toehead/sys/kern/kern_descrip.c#3 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.320 2008/01/13 14:44:08 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.321 2008/01/20 19:55:52 rwatson Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
@@ -2514,6 +2514,10 @@
 			kif->kf_type = KF_TYPE_MQUEUE;
 			break;
 
+		case DTYPE_SHM:
+			kif->kf_type = KF_TYPE_SHM;
+			break;
+
 		default:
 			kif->kf_type = KF_TYPE_UNKNOWN;
 			break;

==== //depot/projects/toehead/sys/kern/syscalls.c#3 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call names.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/syscalls.c,v 1.215 2008/01/08 22:01:26 jhb Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.235 2008/01/08 21:58:15 jhb Exp 
+ * $FreeBSD: src/sys/kern/syscalls.c,v 1.216 2008/01/20 23:44:23 rwatson Exp $
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.236 2008/01/20 23:43:06 rwatson Exp 
  */
 
 const char *syscallnames[] = {

==== //depot/projects/toehead/sys/kern/syscalls.master#3 (text+ko) ====

@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/kern/syscalls.master,v 1.235 2008/01/08 21:58:15 jhb Exp $
+ $FreeBSD: src/sys/kern/syscalls.master,v 1.236 2008/01/20 23:43:06 rwatson Exp $
 ;	from: @(#)syscalls.master	8.2 (Berkeley) 1/13/94
 ;
 ; System call name/number master file.
@@ -847,8 +847,8 @@
 479	AUE_TRUNCATE	STD	{ int truncate(char *path, off_t length); }
 480	AUE_FTRUNCATE	STD	{ int ftruncate(int fd, off_t length); }
 481	AUE_KILL	STD	{ int thr_kill2(pid_t pid, long id, int sig); }
-482	AUE_NULL	STD	{ int shm_open(const char *path, int flags, \
+482	AUE_SHMOPEN	STD	{ int shm_open(const char *path, int flags, \
 				    mode_t mode); }
-483	AUE_NULL	STD	{ int shm_unlink(const char *path); }
+483	AUE_SHMUNLINK	STD	{ int shm_unlink(const char *path); }
 ; Please copy any additions and changes to the following compatability tables:
 ; sys/compat/freebsd32/syscalls.master

==== //depot/projects/toehead/sys/kern/systrace_args.c#3 (text+ko) ====

@@ -2,7 +2,7 @@
  * System call argument to DTrace register array converstion.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/systrace_args.c,v 1.15 2008/01/08 22:01:26 jhb Exp $
+ * $FreeBSD: src/sys/kern/systrace_args.c,v 1.16 2008/01/20 23:44:23 rwatson Exp $
  * This file is part of the DTrace syscall provider.
  */
 

==== //depot/projects/toehead/sys/modules/sf/Makefile#2 (text+ko) ====

@@ -1,6 +1,6 @@
-# $FreeBSD: src/sys/modules/sf/Makefile,v 1.14 2005/09/27 18:10:38 mlaier Exp $
+# $FreeBSD: src/sys/modules/sf/Makefile,v 1.15 2008/01/21 04:27:32 yongari Exp $
 
-.PATH: ${.CURDIR}/../../pci
+.PATH: ${.CURDIR}/../../dev/sf
 
 KMOD=	if_sf
 SRCS=	if_sf.c device_if.h bus_if.h pci_if.h

==== //depot/projects/toehead/sys/netinet6/in6_src.c#4 (text+ko) ====

@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet6/in6_src.c,v 1.48 2008/01/08 19:08:57 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/in6_src.c,v 1.49 2008/01/20 10:08:15 bz Exp $");
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -141,14 +141,20 @@
 	if ((r) < sizeof(ip6stat.ip6s_sources_rule) / \
 		sizeof(ip6stat.ip6s_sources_rule[0])) /* check for safety */ \
 		ip6stat.ip6s_sources_rule[(r)]++; \
-	/* printf("in6_selectsrc: replace %s with %s by %d\n", ia_best ? ip6_sprintf(&ia_best->ia_addr.sin6_addr) : "none", ip6_sprintf(&ia->ia_addr.sin6_addr), (r)); */ \
+	/* { \
+	char ip6buf[INET6_ADDRSTRLEN], ip6b[INET6_ADDRSTRLEN]; \
+	printf("in6_selectsrc: replace %s with %s by %d\n", ia_best ? ip6_sprintf(ip6buf, &ia_best->ia_addr.sin6_addr) : "none", ip6_sprintf(ip6b, &ia->ia_addr.sin6_addr), (r)); \
+	} */ \
 	goto replace; \
 } while(0)
 #define NEXT(r) do {\
 	if ((r) < sizeof(ip6stat.ip6s_sources_rule) / \
 		sizeof(ip6stat.ip6s_sources_rule[0])) /* check for safety */ \
 		ip6stat.ip6s_sources_rule[(r)]++; \
-	/* printf("in6_selectsrc: keep %s against %s by %d\n", ia_best ? ip6_sprintf(&ia_best->ia_addr.sin6_addr) : "none", ip6_sprintf(&ia->ia_addr.sin6_addr), (r)); */ \
+	/* { \
+	char ip6buf[INET6_ADDRSTRLEN], ip6b[INET6_ADDRSTRLEN]; \
+	printf("in6_selectsrc: keep %s against %s by %d\n", ia_best ? ip6_sprintf(ip6buf, &ia_best->ia_addr.sin6_addr) : "none", ip6_sprintf(ip6b, &ia->ia_addr.sin6_addr), (r)); \
+	} */ \
 	goto next;		/* XXX: we can't use 'continue' here */ \
 } while(0)
 #define BREAK(r) do { \

==== //depot/projects/toehead/sys/pci/amdsmb.c#2 (text+ko) ====

@@ -1,5 +1,31 @@
+/*-
+ * Copyright (c) 2005 Ruslan Ermilov
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pci/amdsmb.c,v 1.4 2007/01/11 19:56:24 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/pci/amdsmb.c,v 1.5 2008/01/21 13:26:33 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>

==== //depot/projects/toehead/sys/pci/nfsmb.c#2 (text+ko) ====

@@ -1,5 +1,31 @@
+/*-
+ * Copyright (c) 2005 Ruslan Ermilov
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pci/nfsmb.c,v 1.7 2007/11/10 17:12:08 remko Exp $");
+__FBSDID("$FreeBSD: src/sys/pci/nfsmb.c,v 1.8 2008/01/21 13:26:33 ru Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>

==== //depot/projects/toehead/sys/sparc64/conf/GENERIC#3 (text+ko) ====

@@ -18,7 +18,7 @@
 #
 # For hardware specific information check HARDWARE.TXT
 #
-# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.130 2008/01/07 21:40:11 jhb Exp $
+# $FreeBSD: src/sys/sparc64/conf/GENERIC,v 1.131 2008/01/21 06:51:25 yongari Exp $
 
 cpu		SUN4U
 ident		GENERIC
@@ -177,7 +177,7 @@
 #device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
 device		re		# RealTek 8139C+/8169/8169S/8110S
 device		rl		# RealTek 8129/8139
-#device		sf		# Adaptec AIC-6915 (``Starfire'')
+device		sf		# Adaptec AIC-6915 (``Starfire'')
 #device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
 device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
 #device		ste		# Sundance ST201 (D-Link DFE-550TX)

==== //depot/projects/toehead/sys/sys/syscall.h#3 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call numbers.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/sys/syscall.h,v 1.212 2008/01/08 22:01:26 jhb Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.235 2008/01/08 21:58:15 jhb Exp 
+ * $FreeBSD: src/sys/sys/syscall.h,v 1.213 2008/01/20 23:44:24 rwatson Exp $
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.236 2008/01/20 23:43:06 rwatson Exp 
  */
 
 #define	SYS_syscall	0

==== //depot/projects/toehead/sys/sys/syscall.mk#3 (text+ko) ====

@@ -1,7 +1,7 @@
 # FreeBSD system call names.
 # DO NOT EDIT-- this file is automatically generated.
-# $FreeBSD: src/sys/sys/syscall.mk,v 1.167 2008/01/08 22:01:26 jhb Exp $
-# created from FreeBSD: src/sys/kern/syscalls.master,v 1.235 2008/01/08 21:58:15 jhb Exp 
+# $FreeBSD: src/sys/sys/syscall.mk,v 1.168 2008/01/20 23:44:24 rwatson Exp $
+# created from FreeBSD: src/sys/kern/syscalls.master,v 1.236 2008/01/20 23:43:06 rwatson Exp 
 MIASM =  \
 	syscall.o \
 	exit.o \

==== //depot/projects/toehead/sys/sys/sysproto.h#3 (text+ko) ====

@@ -2,8 +2,8 @@
  * System call prototypes.
  *
  * DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/sys/sysproto.h,v 1.216 2008/01/08 22:01:26 jhb Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.235 2008/01/08 21:58:15 jhb Exp 
+ * $FreeBSD: src/sys/sys/sysproto.h,v 1.217 2008/01/20 23:44:24 rwatson Exp $
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.236 2008/01/20 23:43:06 rwatson Exp 
  */
 
 #ifndef _SYS_SYSPROTO_H_
@@ -2433,8 +2433,8 @@
 #define	SYS_AUE_truncate	AUE_TRUNCATE
 #define	SYS_AUE_ftruncate	AUE_FTRUNCATE
 #define	SYS_AUE_thr_kill2	AUE_KILL
-#define	SYS_AUE_shm_open	AUE_NULL
-#define	SYS_AUE_shm_unlink	AUE_NULL
+#define	SYS_AUE_shm_open	AUE_SHMOPEN
+#define	SYS_AUE_shm_unlink	AUE_SHMUNLINK
 
 #undef PAD_
 #undef PADL_

==== //depot/projects/toehead/sys/sys/user.h#2 (text+ko) ====

@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)user.h	8.2 (Berkeley) 9/23/93
- * $FreeBSD: src/sys/sys/user.h,v 1.72 2007/12/02 21:52:18 rwatson Exp $
+ * $FreeBSD: src/sys/sys/user.h,v 1.73 2008/01/20 19:55:52 rwatson Exp $
  */
 
 #ifndef _SYS_USER_H_
@@ -245,6 +245,7 @@
 #define	KF_TYPE_KQUEUE	5
 #define	KF_TYPE_CRYPTO	6
 #define	KF_TYPE_MQUEUE	7
+#define	KF_TYPE_SHM	8
 #define	KF_TYPE_UNKNOWN	255
 
 #define	KF_VTYPE_VNON	0

==== //depot/projects/toehead/tools/build/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/tools/build/Makefile,v 1.12 2005/05/16 09:32:41 ru Exp $
+# $FreeBSD: src/tools/build/Makefile,v 1.13 2008/01/21 18:44:55 obrien Exp $
 
 .PATH: ${.CURDIR}/../../include
 
@@ -9,11 +9,6 @@
 
 BOOTSTRAPPING?=	0
 
-# usr.bin/gencat needs <nl_types.h>.
-.if ${BOOTSTRAPPING} < 600017
-INCS+=		nl_types.h
-.endif
-
 .if empty(SRCS)
 SRCS=		dummy.c
 .endif

==== //depot/projects/toehead/usr.bin/mt/mt.1#2 (text+ko) ====


>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list