svn commit: r222038 - in projects/largeSMP: . contrib/top etc/rc.d lib lib/libc/sys lib/libpkg lib/libsbuf sbin/ipfw share/man/man4 share/man/man5 share/man/man9 share/misc share/mk sys/dev/ath sys...

Attilio Rao attilio at FreeBSD.org
Tue May 17 22:03:02 UTC 2011 

Author: attilio
Date: Tue May 17 22:03:01 2011
New Revision: 222038
URL: http://svn.freebsd.org/changeset/base/222038

Log:
  MFC

Added:
  projects/largeSMP/lib/libsbuf/Symbol.map
     - copied unchanged from r222037, head/lib/libsbuf/Symbol.map
  projects/largeSMP/lib/libsbuf/Version.def
     - copied unchanged from r222037, head/lib/libsbuf/Version.def
  projects/largeSMP/tools/build/options/WITH_OFED
  projects/largeSMP/usr.sbin/pkg_install/lib/
     - copied from r222037, head/usr.sbin/pkg_install/lib/
Deleted:
  projects/largeSMP/lib/libpkg/
Modified:
  projects/largeSMP/Makefile.inc1
  projects/largeSMP/etc/rc.d/ipfilter
  projects/largeSMP/etc/rc.d/pf
  projects/largeSMP/lib/Makefile
  projects/largeSMP/lib/libc/sys/mq_setattr.2
  projects/largeSMP/lib/libsbuf/Makefile
  projects/largeSMP/sbin/ipfw/ipfw.8
  projects/largeSMP/share/man/man4/cc_hd.4
  projects/largeSMP/share/man/man4/geom_map.4
  projects/largeSMP/share/man/man4/xhci.4
  projects/largeSMP/share/man/man5/rc.conf.5
  projects/largeSMP/share/man/man5/src.conf.5
  projects/largeSMP/share/man/man9/sbuf.9
  projects/largeSMP/share/misc/iso3166
  projects/largeSMP/share/mk/bsd.libnames.mk
  projects/largeSMP/sys/dev/ath/ah_osdep.c
  projects/largeSMP/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
  projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  projects/largeSMP/sys/dev/cxgbe/t4_main.c
  projects/largeSMP/sys/dev/pci/pcireg.h
  projects/largeSMP/sys/dev/usb/controller/xhci_pci.c
  projects/largeSMP/sys/dev/usb/controller/xhcireg.h
  projects/largeSMP/sys/kern/subr_sbuf.c
  projects/largeSMP/sys/kern/subr_smp.c
  projects/largeSMP/sys/netinet/sctp_output.c
  projects/largeSMP/sys/netinet/sctp_usrreq.c
  projects/largeSMP/sys/powerpc/booke/pmap.c
  projects/largeSMP/usr.sbin/ifmcstat/ifmcstat.8
  projects/largeSMP/usr.sbin/pkg_install/Makefile
  projects/largeSMP/usr.sbin/pkg_install/Makefile.inc
  projects/largeSMP/usr.sbin/pkg_install/add/Makefile
  projects/largeSMP/usr.sbin/pkg_install/add/extract.c
  projects/largeSMP/usr.sbin/pkg_install/add/futil.c
  projects/largeSMP/usr.sbin/pkg_install/add/main.c
  projects/largeSMP/usr.sbin/pkg_install/add/perform.c
  projects/largeSMP/usr.sbin/pkg_install/create/Makefile
  projects/largeSMP/usr.sbin/pkg_install/create/main.c
  projects/largeSMP/usr.sbin/pkg_install/create/perform.c
  projects/largeSMP/usr.sbin/pkg_install/create/pl.c
  projects/largeSMP/usr.sbin/pkg_install/delete/Makefile
  projects/largeSMP/usr.sbin/pkg_install/delete/main.c
  projects/largeSMP/usr.sbin/pkg_install/delete/perform.c
  projects/largeSMP/usr.sbin/pkg_install/info/Makefile
  projects/largeSMP/usr.sbin/pkg_install/info/info.h
  projects/largeSMP/usr.sbin/pkg_install/info/main.c
  projects/largeSMP/usr.sbin/pkg_install/info/perform.c
  projects/largeSMP/usr.sbin/pkg_install/info/show.c
  projects/largeSMP/usr.sbin/pkg_install/updating/Makefile
  projects/largeSMP/usr.sbin/pkg_install/updating/main.c
  projects/largeSMP/usr.sbin/pkg_install/version/Makefile
  projects/largeSMP/usr.sbin/pkg_install/version/main.c
  projects/largeSMP/usr.sbin/pkg_install/version/perform.c
Directory Properties:
  projects/largeSMP/   (props changed)
  projects/largeSMP/cddl/contrib/opensolaris/   (props changed)
  projects/largeSMP/contrib/bind9/   (props changed)
  projects/largeSMP/contrib/binutils/   (props changed)
  projects/largeSMP/contrib/bzip2/   (props changed)
  projects/largeSMP/contrib/dialog/   (props changed)
  projects/largeSMP/contrib/ee/   (props changed)
  projects/largeSMP/contrib/expat/   (props changed)
  projects/largeSMP/contrib/file/   (props changed)
  projects/largeSMP/contrib/gcc/   (props changed)
  projects/largeSMP/contrib/gdb/   (props changed)
  projects/largeSMP/contrib/gdtoa/   (props changed)
  projects/largeSMP/contrib/gnu-sort/   (props changed)
  projects/largeSMP/contrib/groff/   (props changed)
  projects/largeSMP/contrib/less/   (props changed)
  projects/largeSMP/contrib/libpcap/   (props changed)
  projects/largeSMP/contrib/libstdc++/   (props changed)
  projects/largeSMP/contrib/llvm/   (props changed)
  projects/largeSMP/contrib/llvm/tools/clang/   (props changed)
  projects/largeSMP/contrib/ncurses/   (props changed)
  projects/largeSMP/contrib/netcat/   (props changed)
  projects/largeSMP/contrib/ntp/   (props changed)
  projects/largeSMP/contrib/one-true-awk/   (props changed)
  projects/largeSMP/contrib/openbsm/   (props changed)
  projects/largeSMP/contrib/openpam/   (props changed)
  projects/largeSMP/contrib/pf/   (props changed)
  projects/largeSMP/contrib/sendmail/   (props changed)
  projects/largeSMP/contrib/tcpdump/   (props changed)
  projects/largeSMP/contrib/tcsh/   (props changed)
  projects/largeSMP/contrib/top/   (props changed)
  projects/largeSMP/contrib/top/install-sh   (props changed)
  projects/largeSMP/contrib/tzcode/stdtime/   (props changed)
  projects/largeSMP/contrib/tzcode/zic/   (props changed)
  projects/largeSMP/contrib/tzdata/   (props changed)
  projects/largeSMP/contrib/wpa/   (props changed)
  projects/largeSMP/contrib/xz/   (props changed)
  projects/largeSMP/crypto/openssh/   (props changed)
  projects/largeSMP/crypto/openssl/   (props changed)
  projects/largeSMP/gnu/lib/   (props changed)
  projects/largeSMP/gnu/usr.bin/binutils/   (props changed)
  projects/largeSMP/gnu/usr.bin/cc/cc_tools/   (props changed)
  projects/largeSMP/gnu/usr.bin/gdb/   (props changed)
  projects/largeSMP/lib/libc/   (props changed)
  projects/largeSMP/lib/libc/stdtime/   (props changed)
  projects/largeSMP/lib/libutil/   (props changed)
  projects/largeSMP/lib/libz/   (props changed)
  projects/largeSMP/sbin/   (props changed)
  projects/largeSMP/sbin/ipfw/   (props changed)
  projects/largeSMP/share/mk/bsd.arch.inc.mk   (props changed)
  projects/largeSMP/share/zoneinfo/   (props changed)
  projects/largeSMP/sys/   (props changed)
  projects/largeSMP/sys/amd64/include/xen/   (props changed)
  projects/largeSMP/sys/boot/   (props changed)
  projects/largeSMP/sys/boot/i386/efi/   (props changed)
  projects/largeSMP/sys/boot/ia64/efi/   (props changed)
  projects/largeSMP/sys/boot/ia64/ski/   (props changed)
  projects/largeSMP/sys/boot/powerpc/boot1.chrp/   (props changed)
  projects/largeSMP/sys/boot/powerpc/ofw/   (props changed)
  projects/largeSMP/sys/cddl/contrib/opensolaris/   (props changed)
  projects/largeSMP/sys/conf/   (props changed)
  projects/largeSMP/sys/contrib/dev/acpica/   (props changed)
  projects/largeSMP/sys/contrib/octeon-sdk/   (props changed)
  projects/largeSMP/sys/contrib/pf/   (props changed)
  projects/largeSMP/sys/contrib/x86emu/   (props changed)
  projects/largeSMP/usr.bin/calendar/   (props changed)
  projects/largeSMP/usr.bin/csup/   (props changed)
  projects/largeSMP/usr.bin/procstat/   (props changed)
  projects/largeSMP/usr.sbin/ndiscvt/   (props changed)
  projects/largeSMP/usr.sbin/zic/   (props changed)

Modified: projects/largeSMP/Makefile.inc1
==============================================================================
--- projects/largeSMP/Makefile.inc1	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/Makefile.inc1	Tue May 17 22:03:01 2011	(r222038)
@@ -1205,7 +1205,7 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \
 		${_kerberos5_lib_libroken} \
 		lib/libbz2 lib/libcom_err lib/libcrypt \
-		lib/libexpat lib/libfetch \
+		lib/libexpat \
 		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
@@ -1238,7 +1238,6 @@ _cddl_lib= cddl/lib
 _secure_lib_libcrypto= secure/lib/libcrypto
 _secure_lib_libssl= secure/lib/libssl
 lib/libradius__L secure/lib/libssl__L: secure/lib/libcrypto__L
-lib/libfetch__L: secure/lib/libcrypto__L secure/lib/libssl__L lib/libmd__L
 .if ${MK_OPENSSH} != "no"
 _secure_lib_libssh= secure/lib/libssh
 secure/lib/libssh__L: lib/libz__L secure/lib/libcrypto__L lib/libcrypt__L
@@ -1274,7 +1273,7 @@ _lib_libypclnt=	lib/libypclnt
 .endif
 
 .if ${MK_OPENSSL} == "no"
-lib/libfetch__L lib/libradius__L: lib/libmd__L
+lib/libradius__L: lib/libmd__L
 .endif
 
 .for _lib in ${_prereq_libs}

Modified: projects/largeSMP/etc/rc.d/ipfilter
==============================================================================
--- projects/largeSMP/etc/rc.d/ipfilter	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/etc/rc.d/ipfilter	Tue May 17 22:03:01 2011	(r222038)
@@ -23,7 +23,7 @@ resync_precmd="$stop_precmd"
 resync_cmd="ipfilter_resync"
 status_precmd="$stop_precmd"
 status_cmd="ipfilter_status"
-extra_commands="reload resync status"
+extra_commands="reload resync"
 required_modules="ipl:ipfilter"
 
 ipfilter_start()

Modified: projects/largeSMP/etc/rc.d/pf
==============================================================================
--- projects/largeSMP/etc/rc.d/pf	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/etc/rc.d/pf	Tue May 17 22:03:01 2011	(r222038)
@@ -19,7 +19,7 @@ check_cmd="pf_check"
 reload_cmd="pf_reload"
 resync_cmd="pf_resync"
 status_cmd="pf_status"
-extra_commands="check reload resync status"
+extra_commands="check reload resync"
 required_files="$pf_rules"
 required_modules="pf"
 

Modified: projects/largeSMP/lib/Makefile
==============================================================================
--- projects/largeSMP/lib/Makefile	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/lib/Makefile	Tue May 17 22:03:01 2011	(r222038)
@@ -89,7 +89,6 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libopie \
 	libpam \
 	libpcap \
-	${_libpkg} \
 	${_libpmc} \
 	${_libproc} \
 	libprocstat \
@@ -215,10 +214,6 @@ _libmp=		libmp
 _libpmc=	libpmc
 .endif
 
-.if ${MK_PKGTOOLS} != "no"
-_libpkg=	libpkg
-.endif
-
 .if ${MK_SENDMAIL} != "no"
 _libmilter=	libmilter
 _libsm=		libsm

Modified: projects/largeSMP/lib/libc/sys/mq_setattr.2
==============================================================================
--- projects/largeSMP/lib/libc/sys/mq_setattr.2	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/lib/libc/sys/mq_setattr.2	Tue May 17 22:03:01 2011	(r222038)
@@ -37,7 +37,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd November 29, 2005
+.Dd May 17, 2011
 .Dt MQ_SETATTR 2
 .Os
 .Sh NAME
@@ -50,7 +50,7 @@
 .Ft int
 .Fo mq_setattr
 .Fa "mqd_t mqdes"
-.Fa "struct mq_attr *restrict mqstat"
+.Fa "const struct mq_attr *restrict mqstat"
 .Fa "struct mq_attr *restrict omqstat"
 .Fc
 .Sh DESCRIPTION

Modified: projects/largeSMP/lib/libsbuf/Makefile
==============================================================================
--- projects/largeSMP/lib/libsbuf/Makefile	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/lib/libsbuf/Makefile	Tue May 17 22:03:01 2011	(r222038)
@@ -1,8 +1,13 @@
 # $FreeBSD$
 
-LIB=	sbuf
-SHLIBDIR?= /lib
-SRCS=	subr_sbuf.c 
+LIB=		sbuf
+SHLIBDIR?= 	/lib
+SRCS=		subr_sbuf.c 
+
+SHLIB_MAJOR	= 6
+
+SYMBOL_MAPS=    ${.CURDIR}/Symbol.map
+VERSION_DEF=	${.CURDIR}/Version.def
 
 .PATH:	${.CURDIR}/../../sys/kern
 

Copied: projects/largeSMP/lib/libsbuf/Symbol.map (from r222037, head/lib/libsbuf/Symbol.map)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/largeSMP/lib/libsbuf/Symbol.map	Tue May 17 22:03:01 2011	(r222038, copy of r222037, head/lib/libsbuf/Symbol.map)
@@ -0,0 +1,24 @@
+/*
+ * $FreeBSD$
+ */
+
+FBSD_1.2 {
+	sbuf_new;
+	sbuf_clear;
+	sbuf_setpos;
+	sbuf_bcat;
+	sbuf_bcpy;
+	sbuf_cat;
+	sbuf_cpy;
+	sbuf_printf;
+	sbuf_vprintf;
+	sbuf_putc;
+	sbuf_set_drain;
+	sbuf_trim;
+	sbuf_error;
+	sbuf_finish;
+	sbuf_data;
+	sbuf_len;
+	sbuf_done;
+	sbuf_delete;
+};

Copied: projects/largeSMP/lib/libsbuf/Version.def (from r222037, head/lib/libsbuf/Version.def)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/largeSMP/lib/libsbuf/Version.def	Tue May 17 22:03:01 2011	(r222038, copy of r222037, head/lib/libsbuf/Version.def)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+FBSD_1.2 {
+};

Modified: projects/largeSMP/sbin/ipfw/ipfw.8
==============================================================================
--- projects/largeSMP/sbin/ipfw/ipfw.8	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/sbin/ipfw/ipfw.8	Tue May 17 22:03:01 2011	(r222038)
@@ -565,9 +565,9 @@ if the sysctl variable
 is set to 0 (default), one can use
 .Xr bpf 4
 attached to the
-.Xr ipfw0
+.Li ipfw0
 pseudo interface. There is no overhead if no 
-.Xr bpf
+.Xr bpf 4
 is attached to the pseudo interface.
 .Pp
 If

Modified: projects/largeSMP/share/man/man4/cc_hd.4
==============================================================================
--- projects/largeSMP/share/man/man4/cc_hd.4	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/share/man/man4/cc_hd.4	Tue May 17 22:03:01 2011	(r222038)
@@ -98,7 +98,7 @@ Community Foundation Silicon Valley.
 .Sh FUTURE WORK
 The Hamilton Institute have recently made some improvements to the algorithm
 implemented by this module and have called it Coexistent-TCP (C-TCP).
-The improvments should be evaluated and potentially incorporated into this
+The improvements should be evaluated and potentially incorporated into this
 module.
 .Sh HISTORY
 The

Modified: projects/largeSMP/share/man/man4/geom_map.4
==============================================================================
--- projects/largeSMP/share/man/man4/geom_map.4	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/share/man/man4/geom_map.4	Tue May 17 22:03:01 2011	(r222038)
@@ -25,12 +25,12 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 5, 2011
+.Dd May 17, 2011
 .Dt GEOM_MAP 4
 .Os
 .Sh NAME
 .Nm geom_map
-.Nd "GEOM module that map difined items as separate partitions"
+.Nd "GEOM module that maps defined items as separate partitions"
 .Sh SYNOPSIS
 To compile this driver into the kernel,
 place the following line in your
@@ -41,16 +41,16 @@ kernel configuration file:
 .Sh DESCRIPTION
 The
 .Nm
-framework provides support for mapping defined parts of the media. Basicaly it
-is helpful in the embedded devices where in the one continous flash are loader,
-kernel and rootfs parts. The
+framework provides support for mapping defined parts of the media.
+Basically it is helpful for embedded devices where in the one continuous
+flash are loader, kernel and rootfs parts.
 .Nm
-allows making them available as separate parts and protect loader from
-overwriting.
+allows making them available as separate parts and protects the loader from
+being overwritten.
 .Pp
 At boot time
 .Nm
-partitions listed (only with bootverbose) as:
+partitions are listed (only with bootverbose) as:
 .Bd -literal -offset indent
 MAP: 0x30000, data=0x30000 "/dev/map/bootloader"
 MAP: 30000x10000, data=0x10000 "/dev/map/factory"
@@ -62,13 +62,19 @@ MAP: 150000x690000, data=0x690000 "/dev/
 MAP: 7e0000x20000, data=0x20000 "/dev/map/config"
 .Ed
 .Pp
-Also
+The current
 .Nm
-current configuration can be accessible with sysctl's kern.geom.conftxt,
-kern.geom.confxml, kern.geom.confdot or geom map list.
+configuration can be accessed with the following
+.Xr sysctl 8
+nodes:
+.Va kern.geom.conftxt , kern.geom.confxml ,
+and
+.Va kern.geom.confdot
+or by using
+.Dq Li "geom map list" .
 .Bd -literal -offset indent
-# sysctl kern.geom.conftxt
-kern.geom.conftxt: 0 MD md0 10485760 512 u 0 s 512 f 0 fs 0 l 10485760 t malloc
+# sysctl -n kern.geom.conftxt
+0 MD md0 10485760 512 u 0 s 512 f 0 fs 0 l 10485760 t malloc
 0 DISK cfid0 8388608 4 hd 0 sc 0
 1 MAP map/config 131072 4 i 5 o 8257536 entry 0 dsize 131072
 1 MAP map/rootfs 6881280 4 i 4 o 1376256 entry 0 dsize 6881280
@@ -79,49 +85,55 @@ kern.geom.conftxt: 0 MD md0 10485760 512
 1 MAP map/bootloader 196608 4 i 0 o 0 entry 0 dsize 196608
 .Ed
 .Pp
-Driver configuration can be done in device hints file. List of used parameters:
+Driver configuration can be done in
+.Xr device.hints 5 .
+List of used parameters:
 .Bl -tag -width indent
-.It Fa at
+.It Va at
 select media to attach
-.It Fa name
-name of partiton (will create device /dev/map/that_name)
-.It Fa start
+.It Va name
+name of partition (will create device
+.Pa /dev/map/ Ns Ar that_name )
+.It Va start
 offset from the beginning of the parent media to start of the mapped partition.
-This field can also have special value 
-"search:searchstart:searchstep:searchkey", where:
+This field can also have a special value
+.Qq Li search: Ns Ar searchstart Ns Li : Ns Ar searchstep Ns Li : Ns Ar searchkey ,
+where:
 .Bl -tag -width indent
-.It Fa searchstart
+.It Ar searchstart
 offset from the beginning of the parent media where search will be started
-.It Fa searchstep
+.It Ar searchstep
 value of the increment used while searching for the partition boundary markers
-.It Fa searchkey
-key which will be used to find partition boundary markers. Wildcard "." char 
-can be used to match any char on that position
+.It Ar searchkey
+key which will be used to find partition boundary markers.
+The wildcard
+.Ql .\&
+can be used to match any character on that position
 .El
-.It Fa end
-offset from the beginning of the parent media to end of the mapped partition.
-This field can also have special value 
-"search:searchstart:searchstep:searchkey", look "start" for details.
-.It Fa offset
-offset where the data of mapped partition begins
+.It Va end
+offset from the beginning of the parent media to the end of the mapped partition.
+This field can also have the special value
+.Qq Li search: Ns Ar searchstart Ns Li : Ns Ar searchstep Ns Li : Ns Ar searchkey ,
+as described above.
+.It Va offset
+offset where the data of the mapped partition begins
 .El
 .Pp
-Each record contains start address(bytes) from the media begin, size(bytes),
-offset where the data of mapped partition begins, and the name of new device.
+Each record contains the start address (in bytes) from the media begin, size
+(in bytes), offset where the data of mapped partition begins, and the name of
+new device.
 .Bd -literal -offset indent
 MAP: 150000x690000, data=0x690000 "/dev/map/rootfs"
 .Ed
 .Bd -literal
-00150000 - begin address
+00150000 - start address
 00690000 - size
 00000000 - data begin from zero offset
 00690000 - data size
 "map/rootfs" - new media will be accessible via /dev/map/rootfs dev.
 .Ed
 .Sh EXAMPLES
-.Pp
-.Bl -bullet -compact
-If we need to implement layout shown above, we need to define the folowing
+If we need to implement layout shown above, we need to define the following
 hints:
 .Bd -literal -offset indent
 hint.map.0.at="cfid0"
@@ -129,10 +141,17 @@ hint.map.0.start=0x00000000
 hint.map.0.end=0x00030000
 hint.map.0.name="bootloader"
 hint.map.0.readonly=1
-
 .Ed
-define "/dev/map/bootloader" at disk "cfid0" starting at 0x00000000 and end
-0x00030000, also marked as readonly.
+.Pp
+This defines
+.Pa /dev/map/bootloader
+at disk
+.Pa cfid0
+starting at
+.Li 0x00000000
+and ending at
+.Li 0x00030000 ,
+it is also marked as readonly.
 .Bd -literal -offset indent
 hint.map.1.at="cfid0"
 hint.map.1.start=0x00030000
@@ -148,13 +167,28 @@ hint.map.3.at="cfid0"
 hint.map.3.name="kernel"
 hint.map.3.start=0x00040000
 hint.map.3.end="search:0x00100000:0x10000:.!/bin/sh"
-
 .Ed
-define "/dev/map/kernel" at disk "cfid0" starting at 0x00040000, but end
-position must be searched by the key ".!/bin/sh", from offset 0x00100000 to end
-of media with step 0x10000. Real marker in that case is "#!/bin/sh", but "#"
-terminates the line when hints file is parsed, so we need to use wildcard "." 
-instead of "#".
+.Pp
+This defines
+.Pa /dev/map/kernel
+at disk
+.Pa cfid0
+starting at
+.Li 0x00040000 ,
+but the end position must be searched by finding the key
+.Dq Li ".!/bin/sh" ,
+from offset
+.Li 0x00100000
+to the end of media with step
+.Li 0x10000 .
+The real marker in this case is
+.Dq Li "#!/bin/sh" ,
+but
+.Ql #
+terminates the line when the hints file is parsed, so we need to use wildcard
+.Ql .\&
+instead of
+.Ql # .
 .Bd -literal -offset indent
 hint.map.4.at="cfid0"
 hint.map.4.name="rootfs"
@@ -166,13 +200,11 @@ hint.map.5.start=0x007e0000
 hint.map.5.end=0x00800000
 hint.map.5.name="config"
 .Ed
-.El
 .Sh SEE ALSO
-.Xr GEOM 4 ,
+.Xr geom 4 ,
 .Xr geom 8 ,
 .Xr sysctl 8
 .Sh AUTHORS
-.An -nosplit
 The
 .Nm
 driver was written by

Modified: projects/largeSMP/share/man/man4/xhci.4
==============================================================================
--- projects/largeSMP/share/man/man4/xhci.4	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/share/man/man4/xhci.4	Tue May 17 22:03:01 2011	(r222038)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd February 24, 2011
+.Dd May 17, 2011
 .Dt XHCI 4
 .Os
 .Sh NAME
@@ -49,6 +49,13 @@ The
 controller supports
 .Tn USB
 connection speeds up to 5.0Gbps when using a USB 3.0 compliant device.
+.Sh HARDWARE
+The
+.Nm
+driver supports
+.Tn XHCI
+compatible controllers having PCI class 12 (serial bus),
+subclass 3 (USB) and programming interface 48 (XHCI).
 .Sh SEE ALSO
 .Xr ehci 4 ,
 .Xr ohci 4 ,

Modified: projects/largeSMP/share/man/man5/rc.conf.5
==============================================================================
--- projects/largeSMP/share/man/man5/rc.conf.5	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/share/man/man5/rc.conf.5	Tue May 17 22:03:01 2011	(r222038)
@@ -3772,7 +3772,7 @@ Set to
 .Dq Li -l -U root
 by default.
 These are flags to pass to
-.Xr jail .
+.Xr jail 8 .
 .It Va jail_ Ns Ao Ar jname Ac Ns Va _interface
 .Pq Vt str
 Unset by default.

Modified: projects/largeSMP/share/man/man5/src.conf.5
==============================================================================
--- projects/largeSMP/share/man/man5/src.conf.5	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/share/man/man5/src.conf.5	Tue May 17 22:03:01 2011	(r222038)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
 .\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru
 .\" $FreeBSD$
-.Dd May 10, 2011
+.Dd May 17, 2011
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -712,6 +712,11 @@ will not be built either if this option 
 Set to not build
 .Xr ntpd 8
 and related programs.
+.It Va WITH_OFED
+.\" from FreeBSD: head/tools/build/options/WITH_OFED 222016 2011-05-17 11:06:41Z ru
+Set to build the
+.Dq "OpenFabrics Enterprise Distribution"
+Infiniband software stack.
 .It Va WITHOUT_OPENSSH
 .\" from FreeBSD: head/tools/build/options/WITHOUT_OPENSSH 156932 2006-03-21 07:50:50Z ru
 Set to not build OpenSSH.

Modified: projects/largeSMP/share/man/man9/sbuf.9
==============================================================================
--- projects/largeSMP/share/man/man9/sbuf.9	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/share/man/man9/sbuf.9	Tue May 17 22:03:01 2011	(r222038)
@@ -52,7 +52,7 @@
 .Nm sbuf_len ,
 .Nm sbuf_done ,
 .Nm sbuf_delete
-.Nd safe string formatting
+.Nd safe string composition
 .Sh SYNOPSIS
 .In sys/types.h
 .In sys/sbuf.h
@@ -106,14 +106,20 @@
 .Sh DESCRIPTION
 The
 .Nm
-family of functions allows one to safely allocate, construct and
-release bounded NUL-terminated strings in kernel space.
+family of functions allows one to safely allocate, compose and
+release strings in kernel or user space.
+.Pp
 Instead of arrays of characters, these functions operate on structures
 called
 .Fa sbufs ,
 defined in
 .In sys/sbuf.h .
 .Pp
+Any errors encountered during the allocation or composition of the
+string will be latched in the data structure,
+making a single error test at the end of the composition 
+sufficient to determine success or failure of the entire process.
+.Pp
 The
 .Fn sbuf_new
 function initializes the
@@ -468,14 +474,35 @@ The
 function
 returns \-1 if copying string from userland failed, and number of bytes
 copied otherwise.
+.Pp
 The
-.Fn sbuf_finish
-function returns ENOMEM if the sbuf overflowed before being finished,
+.Fn sbuf_finish 9
+function (the kernel version) returns ENOMEM if the sbuf overflowed before
+being finished,
 or returns the error code from the drain if one is attached.
-When used as
-.Xr sbuf_finish 3 ,
-.Fn sbuf_finish
-will return \-1 and set errno on error instead.
+.Pp
+The
+.Fn sbuf_finish 3 
+function (the userland version)
+will return zero for success and \-1 and set errno on error.
+.Sh EXAMPLES
+.Bd -literal -compact
+#include <sys/sbuf.h>
+
+struct sbuf *sb;
+
+sb = sbuf_new_auto();
+sbuf_cat("Customers found:\en");
+TAILQ_FOREACH(foo, &foolist, list) {
+	sbuf_printf("   %4d %s\en", foo->index, foo->name);
+	sbuf_printf("      Address: %s\en", foo->address);
+	sbuf_printf("      Zip: %s\en", foo->zipcode);
+}
+if (sbuf_finish(sb))
+	err(1,"Could not generate message");
+transmit_msg(sbuf_data(sb), sbuf_len(sb));
+sbuf_delete(sb);
+.Ed
 .Sh SEE ALSO
 .Xr printf 3 ,
 .Xr strcat 3 ,

Modified: projects/largeSMP/share/misc/iso3166
==============================================================================
--- projects/largeSMP/share/misc/iso3166	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/share/misc/iso3166	Tue May 17 22:03:01 2011	(r222038)
@@ -46,6 +46,7 @@ BJ	BEN	204	Benin
 BM	BMU	060	Bermuda
 BT	BTN	064	Bhutan
 BO	BOL	068	Bolivia, Plurinational State of
+BQ	BES	535	Bonaire, Saint Eustatius and Saba
 BA	BIH	070	Bosnia and Herzegovina
 BW	BWA	072	Botswana
 BV	BVT	074	Bouvet Island
@@ -75,6 +76,7 @@ CR	CRI	188	Costa Rica
 CI	CIV	384	Cote d'Ivoire
 HR	HRV	191	Croatia
 CU	CUB	192	Cuba
+CW	CUW	531	Curacao
 CY	CYP	196	Cyprus
 CZ	CZE	203	Czech Republic
 DK	DNK	208	Denmark
@@ -174,7 +176,6 @@ NA	NAM	516	Namibia
 NR	NRU	520	Nauru
 NP	NPL	524	Nepal
 NL	NLD	528	Netherlands
-AN	ANT	530	Netherlands Antilles
 NC	NCL	540	New Caledonia
 NZ	NZL	554	New Zealand
 NI	NIC	558	Nicaragua
@@ -205,7 +206,7 @@ RW	RWA	646	Rwanda
 BL	BLM	652	Saint Barthelemy
 KN	KNA	659	Saint Kitts and Nevis
 LC	LCA	662	Saint Lucia
-MF	MAF	663	Saint Martin
+MF	MAF	663	Saint Martin (French Part)
 VC	VCT	670	Saint Vincent and the Grenadines
 WS	WSM	882	Samoa
 SM	SMR	674	San Marino
@@ -216,6 +217,7 @@ RS	SRB	688	Serbia
 SC	SYC	690	Seychelles
 SL	SLE	694	Sierra Leone
 SG	SGP	702	Singapore
+SX	SXM	534	Sint Maarten (Dutch part)
 SK	SVK	703	Slovakia
 SI	SVN	705	Slovenia
 SB	SLB	090	Solomon Islands
@@ -224,7 +226,7 @@ ZA	ZAF	710	South Africa
 GS	SGS	239	South Georgia and the South Sandwich Islands
 ES	ESP	724	Spain
 LK	LKA	144	Sri Lanka
-SH	SHN	654	Saint Helena
+SH	SHN	654	Saint Helena, Ascension and Tristan da Cunha
 PM	SPM	666	Saint Pierre and Miquelon
 SD	SDN	736	Sudan
 SR	SUR	740	Suriname
@@ -395,7 +397,7 @@ ZW	ZWE	716	Zimbabwe
 # Newsletter III-41 1993-07-28
 #   MAURITIUS, changes outside this document
 #
-# Newletter III-42 1993-07-12
+# Newsletter III-42 1993-07-12
 #   SAINT VINCENT AND THE GRENADINES, changes outside this document
 #
 # Newsletter III-43 1993-07-12
@@ -426,15 +428,15 @@ ZW	ZWE	716	Zimbabwe
 #   Czechoslovakia officially deleted
 #
 # Newsletter III-52, 1993-07-02
-#   Angola, changing information not included in this file. Offical name
+#   Angola, changing information not included in this file. Official name
 #   change to Republic of Angola
 #
 # Newsletter III-53, 1993-07-12
-#   Madagascar, changing information not included in this file. Official 
+#   Madagascar, changing information not included in this file. Official
 #   name change to Republic of Madagascar
 #
 # Newsletter III-54, 1993-07-23
-#   South Georgia and the South Sandwich Islands, previously covered by 
+#   South Georgia and the South Sandwich Islands, previously covered by
 #   Falkland Islands
 #
 # Newsletter III-55, 1993-07-16
@@ -450,23 +452,23 @@ ZW	ZWE	716	Zimbabwe
 #
 # Newsletter III-58, 1993-07-16
 #   Afghanistan, changing information not included in this file
-#   Official name change to Islamic State of Afghanistan  
+#   Official name change to Islamic State of Afghanistan
 #
-# Newsletter III-32, 1993-07-25 ammendment
-#   Kyrgyzstan, changing information not included in this file. Offical name
+# Newsletter III-32, 1993-07-25 amendment
+#   Kyrgyzstan, changing information not included in this file. Official name
 #   change to Kyrgyz Republic
 #
 # Newsletter III-59, 1994-01-26
-#   Andorra, changing information not included in this file. Offical name
+#   Andorra, changing information not included in this file. Official name
 #   change to Pricipality of Andorra
 #
 # Newsletter III-60, 1994-01-26
-#   Cambodia, changing information not included in this file. Offical name
+#   Cambodia, changing information not included in this file. Official name
 #   change to Kingdom of Cambodia
 #
 # Thu Feb 10 1994
 # At this point the fourth edition of ISO 3166 appears. It can *now* be
-# ordered from national standards institutions. The RIPE NCC will continue 
+# ordered from national standards institutions. The RIPE NCC will continue
 # tracking changes.
 #
 # [deletia]
@@ -537,3 +539,11 @@ ZW	ZWE	716	Zimbabwe
 #
 # Newsletter VI-6 2009-05-08
 #  Name change for Plurinational State of Bolivia.
+#
+# Newsletter VI-7 2010-02-22
+#  Name change for Saint Helena, Ascension and Tristan da Cunha
+#
+# Newsletter VI-8 2010-12-15
+#  BONAIRE, SAINT EUSTATIUS AND SABA (BQ), CURACAO (CW) and
+#  SINT MAARTEN (DUTCH PART) (SX) added as new entries.
+#  NETHERLANDS ANTILLES (AN) removed.

Modified: projects/largeSMP/share/mk/bsd.libnames.mk
==============================================================================
--- projects/largeSMP/share/mk/bsd.libnames.mk	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/share/mk/bsd.libnames.mk	Tue May 17 22:03:01 2011	(r222038)
@@ -129,7 +129,6 @@ MINUSLPAM+=	-lypclnt
 
 LIBPANEL?=	${DESTDIR}${LIBDIR}/libpanel.a
 LIBPCAP?=	${DESTDIR}${LIBDIR}/libpcap.a
-LIBPKG?=	${DESTDIR}${LIBDIR}/libpkg.a
 LIBPMC?=	${DESTDIR}${LIBDIR}/libpmc.a
 LIBPROC?=	${DESTDIR}${LIBDIR}/libproc.a
 LIBPTHREAD?=	${DESTDIR}${LIBDIR}/libpthread.a

Modified: projects/largeSMP/sys/dev/ath/ah_osdep.c
==============================================================================
--- projects/largeSMP/sys/dev/ath/ah_osdep.c	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/sys/dev/ath/ah_osdep.c	Tue May 17 22:03:01 2011	(r222038)
@@ -140,16 +140,20 @@ ath_hal_ether_sprintf(const u_int8_t *ma
 }
 
 #ifdef AH_DEBUG
+
+/* This must match the definition in ath_hal/ah_debug.h */
+#define	HAL_DEBUG_UNMASKABLE	0xf0000000
 void
 DO_HALDEBUG(struct ath_hal *ah, u_int mask, const char* fmt, ...)
 {
-	if (ath_hal_debug & mask) {
+	if ((mask == HAL_DEBUG_UNMASKABLE) || (ath_hal_debug & mask)) {
 		__va_list ap;
 		va_start(ap, fmt);
 		ath_hal_vprintf(ah, fmt, ap);
 		va_end(ap);
 	}
 }
+#undef	HAL_DEBUG_UNMASKABLE
 #endif /* AH_DEBUG */
 
 #ifdef AH_DEBUG_ALQ

Modified: projects/largeSMP/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
==============================================================================
--- projects/largeSMP/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c	Tue May 17 22:03:01 2011	(r222038)
@@ -857,7 +857,7 @@ ar5212GetCapability(struct ath_hal *ah, 
 	case HAL_CAP_MCAST_KEYSRCH:	/* multicast frame keycache search */
 		switch (capability) {
 		case 0:			/* hardware capability */
-			return HAL_OK;
+			return pCap->halMcastKeySrchSupport ? HAL_OK : HAL_ENXIO;
 		case 1:
 			return (ahp->ah_staId1Defaults &
 			    AR_STA_ID1_MCAST_KSRCH) ? HAL_OK : HAL_ENXIO;

Modified: projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
==============================================================================
--- projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c	Tue May 17 22:03:01 2011	(r222038)
@@ -816,7 +816,7 @@ ar5416FillCapabilityInfo(struct ath_hal 
 	pCap->halPSPollBroken = AH_TRUE;	/* XXX fixed in later revs? */
 	pCap->halVEOLSupport = AH_TRUE;
 	pCap->halBssIdMaskSupport = AH_TRUE;
-	pCap->halMcastKeySrchSupport = AH_FALSE;
+	pCap->halMcastKeySrchSupport = AH_TRUE;	/* Works on AR5416 and later */
 	pCap->halTsfAddSupport = AH_TRUE;
 	pCap->hal4AddrAggrSupport = AH_FALSE;	/* Broken in Owl */
 

Modified: projects/largeSMP/sys/dev/cxgbe/t4_main.c
==============================================================================
--- projects/largeSMP/sys/dev/cxgbe/t4_main.c	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/sys/dev/cxgbe/t4_main.c	Tue May 17 22:03:01 2011	(r222038)
@@ -53,6 +53,7 @@ __FBSDID("$FreeBSD$");
 #include <net/if.h>
 #include <net/if_types.h>
 #include <net/if_dl.h>
+#include <net/if_vlan_var.h>
 
 #include "common/t4_hw.h"
 #include "common/common.h"

Modified: projects/largeSMP/sys/dev/pci/pcireg.h
==============================================================================
--- projects/largeSMP/sys/dev/pci/pcireg.h	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/sys/dev/pci/pcireg.h	Tue May 17 22:03:01 2011	(r222038)
@@ -367,6 +367,7 @@
 #define	PCIP_SERIALBUS_USB_UHCI		0x00
 #define	PCIP_SERIALBUS_USB_OHCI		0x10
 #define	PCIP_SERIALBUS_USB_EHCI		0x20
+#define	PCIP_SERIALBUS_USB_XHCI		0x30
 #define	PCIP_SERIALBUS_USB_DEVICE	0xfe
 #define	PCIS_SERIALBUS_FC	0x04
 #define	PCIS_SERIALBUS_SMBUS	0x05

Modified: projects/largeSMP/sys/dev/usb/controller/xhci_pci.c
==============================================================================
--- projects/largeSMP/sys/dev/usb/controller/xhci_pci.c	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/sys/dev/usb/controller/xhci_pci.c	Tue May 17 22:03:01 2011	(r222038)
@@ -137,7 +137,7 @@ xhci_pci_match(device_t self)
 {
 	if ((pci_get_class(self) == PCIC_SERIALBUS)
 	    && (pci_get_subclass(self) == PCIS_SERIALBUS_USB)
-	    && (pci_get_progif(self) == PCI_INTERFACE_XHCI)) {
+	    && (pci_get_progif(self) == PCIP_SERIALBUS_USB_XHCI)) {
 		return ("XHCI (generic) USB 3.0 controller");
 	}
 	return (NULL);			/* dunno */

Modified: projects/largeSMP/sys/dev/usb/controller/xhcireg.h
==============================================================================
--- projects/largeSMP/sys/dev/usb/controller/xhcireg.h	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/sys/dev/usb/controller/xhcireg.h	Tue May 17 22:03:01 2011	(r222038)
@@ -33,7 +33,6 @@
 #define	PCI_XHCI_USBREV		0x60	/* RO USB protocol revision */
 #define	PCI_USB_REV_3_0		0x30	/* USB 3.0 */
 #define	PCI_XHCI_FLADJ		0x61	/* RW frame length adjust */
-#define	PCI_INTERFACE_XHCI	0x30	/* USB 3.0 - XHCI */
 
 /* XHCI capability registers */
 #define	XHCI_CAPLENGTH		0x00	/* RO capability */

Modified: projects/largeSMP/sys/kern/subr_sbuf.c
==============================================================================
--- projects/largeSMP/sys/kern/subr_sbuf.c	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/sys/kern/subr_sbuf.c	Tue May 17 22:03:01 2011	(r222038)
@@ -67,7 +67,7 @@ static MALLOC_DEFINE(M_SBUF, "sbuf", "st
 #define	SBUF_ISDYNSTRUCT(s)	((s)->s_flags & SBUF_DYNSTRUCT)
 #define	SBUF_ISFINISHED(s)	((s)->s_flags & SBUF_FINISHED)
 #define	SBUF_HASROOM(s)		((s)->s_len < (s)->s_size - 1)
-#define	SBUF_FREESPACE(s)	((s)->s_size - (s)->s_len - 1)
+#define	SBUF_FREESPACE(s)	((s)->s_size - ((s)->s_len + 1))
 #define	SBUF_CANEXTEND(s)	((s)->s_flags & SBUF_AUTOEXTEND)
 
 /*
@@ -77,8 +77,14 @@ static MALLOC_DEFINE(M_SBUF, "sbuf", "st
 #define	SBUF_CLEARFLAG(s, f)	do { (s)->s_flags &= ~(f); } while (0)
 
 #define	SBUF_MINEXTENDSIZE	16		/* Should be power of 2. */
+
+#ifdef PAGE_SIZE
 #define	SBUF_MAXEXTENDSIZE	PAGE_SIZE
 #define	SBUF_MAXEXTENDINCR	PAGE_SIZE
+#else
+#define	SBUF_MAXEXTENDSIZE	4096
+#define	SBUF_MAXEXTENDINCR	4096
+#endif
 
 /*
  * Debugging support
@@ -138,7 +144,6 @@ sbuf_extendsize(int size)
 	return (newsize);
 }
 
-
 /*
  * Extend an sbuf.
  */
@@ -154,7 +159,7 @@ sbuf_extend(struct sbuf *s, int addlen)
 	newbuf = SBMALLOC(newsize);
 	if (newbuf == NULL)
 		return (-1);
-	bcopy(s->s_buf, newbuf, s->s_size);
+	memcpy(newbuf, s->s_buf, s->s_size);
 	if (SBUF_ISDYNAMIC(s))
 		SBFREE(s->s_buf);
 	else
@@ -165,6 +170,38 @@ sbuf_extend(struct sbuf *s, int addlen)
 }
 
 /*
+ * Initialize the internals of an sbuf.
+ * If buf is non-NULL, it points to a static or already-allocated string
+ * big enough to hold at least length characters.
+ */
+static struct sbuf *
+sbuf_newbuf(struct sbuf *s, char *buf, int length, int flags)
+{
+
+	memset(s, 0, sizeof(*s));
+	s->s_flags = flags;
+	s->s_size = length;
+	s->s_buf = buf;
+
+	if ((s->s_flags & SBUF_AUTOEXTEND) == 0) {
+		KASSERT(s->s_size > 1,
+		    ("attempt to create a too small sbuf"));
+	}
+
+	if (s->s_buf != NULL)
+		return (s);
+
+	if ((flags & SBUF_AUTOEXTEND) != 0)
+		s->s_size = sbuf_extendsize(s->s_size);
+
+	s->s_buf = SBMALLOC(s->s_size);
+	if (s->s_buf == NULL)
+		return (NULL);
+	SBUF_SETFLAG(s, SBUF_DYNAMIC);
+	return (s);
+}
+
+/*
  * Initialize an sbuf.
  * If buf is non-NULL, it points to a static or already-allocated string
  * big enough to hold at least length characters.
@@ -179,31 +216,17 @@ sbuf_new(struct sbuf *s, char *buf, int 
 	    ("%s called with invalid flags", __func__));
 
 	flags &= SBUF_USRFLAGMSK;
-	if (s == NULL) {
-		s = SBMALLOC(sizeof(*s));
-		if (s == NULL)
-			return (NULL);
-		bzero(s, sizeof(*s));
-		s->s_flags = flags;
-		SBUF_SETFLAG(s, SBUF_DYNSTRUCT);
-	} else {
-		bzero(s, sizeof(*s));
-		s->s_flags = flags;
-	}
-	s->s_size = length;
-	if (buf != NULL) {
-		s->s_buf = buf;
-		return (s);
-	}
-	if ((flags & SBUF_AUTOEXTEND) != 0)
-		s->s_size = sbuf_extendsize(s->s_size);
-	s->s_buf = SBMALLOC(s->s_size);
-	if (s->s_buf == NULL) {
-		if (SBUF_ISDYNSTRUCT(s))
-			SBFREE(s);
+	if (s != NULL)
+		return (sbuf_newbuf(s, buf, length, flags));
+
+	s = SBMALLOC(sizeof(*s));
+	if (s == NULL)
+		return (NULL);
+	if (sbuf_newbuf(s, buf, length, flags) == NULL) {
+		SBFREE(s);
 		return (NULL);
 	}
-	SBUF_SETFLAG(s, SBUF_DYNAMIC);
+	SBUF_SETFLAG(s, SBUF_DYNSTRUCT);
 	return (s);
 }
 
@@ -328,7 +351,7 @@ sbuf_drain(struct sbuf *s)
  * buffer and marking overflow.
  */
 static void
-sbuf_put_byte(int c, struct sbuf *s)
+sbuf_put_byte(struct sbuf *s, int c)
 {
 
 	assert_sbuf_integrity(s);
@@ -337,7 +360,7 @@ sbuf_put_byte(int c, struct sbuf *s)
 	if (s->s_error != 0)
 		return;
 	if (SBUF_FREESPACE(s) <= 0) {
-		/* 
+		/*
 		 * If there is a drain, use it, otherwise extend the
 		 * buffer.
 		 */
@@ -352,18 +375,6 @@ sbuf_put_byte(int c, struct sbuf *s)
 }
 
 /*
- * Append a non-NUL character to an sbuf.  This prototype signature is
- * suitable for use with kvprintf(9).
- */
-static void
-sbuf_putc_func(int c, void *arg)
-{
-
-	if (c != '\0')
-		sbuf_put_byte(c, arg);
-}
-
-/*
  * Append a byte string to an sbuf.
  */
 int
@@ -378,10 +389,10 @@ sbuf_bcat(struct sbuf *s, const void *bu
 	if (s->s_error != 0)
 		return (-1);
 	for (; str < end; str++) {
-		sbuf_put_byte(*str, s);
+		sbuf_put_byte(s, *str);
 		if (s->s_error != 0)
 			return (-1);
- 	}
+	}
 	return (0);
 }
 
@@ -443,7 +454,7 @@ sbuf_cat(struct sbuf *s, const char *str
 		return (-1);
 
 	while (*str != '\0') {
-		sbuf_put_byte(*str++, s);
+		sbuf_put_byte(s, *str++);
 		if (s->s_error != 0)
 			return (-1);
 	}
@@ -507,6 +518,19 @@ sbuf_cpy(struct sbuf *s, const char *str
  * Format the given argument list and append the resulting string to an sbuf.
  */
 #ifdef _KERNEL
+
+/*
+ * Append a non-NUL character to an sbuf.  This prototype signature is
+ * suitable for use with kvprintf(9).
+ */
+static void
+sbuf_putc_func(int c, void *arg)
+{
+
+	if (c != '\0')
+		sbuf_put_byte(arg, c);
+}
+
 int
 sbuf_vprintf(struct sbuf *s, const char *fmt, va_list ap)
 {
@@ -611,7 +635,7 @@ int
 sbuf_putc(struct sbuf *s, int c)
 {
 
-	sbuf_putc_func(c, s);
+	sbuf_put_byte(s, c);
 	if (s->s_error != 0)
 		return (-1);
 	return (0);
@@ -654,24 +678,23 @@ sbuf_error(const struct sbuf *s)
 int
 sbuf_finish(struct sbuf *s)
 {
-	int error;
 
 	assert_sbuf_integrity(s);
 	assert_sbuf_state(s, 0);
 
-	error = s->s_error;
 	if (s->s_drain_func != NULL) {
-		while (s->s_len > 0 && error == 0)
-			error = sbuf_drain(s);
+		while (s->s_len > 0 && s->s_error == 0)
+			s->s_error = sbuf_drain(s);
 	}
 	s->s_buf[s->s_len] = '\0';
-	s->s_error = 0;
 	SBUF_SETFLAG(s, SBUF_FINISHED);
 #ifdef _KERNEL
-	return (error);
+	return (s->s_error);
 #else
-	errno = error;
-	return (-1);
+	errno = s->s_error;
+	if (s->s_error)
+		return (-1);
+	return (0);
 #endif
 }
 
@@ -721,7 +744,7 @@ sbuf_delete(struct sbuf *s)
 	if (SBUF_ISDYNAMIC(s))
 		SBFREE(s->s_buf);
 	isdyn = SBUF_ISDYNSTRUCT(s);
-	bzero(s, sizeof(*s));
+	memset(s, 0, sizeof(*s));
 	if (isdyn)
 		SBFREE(s);
 }

Modified: projects/largeSMP/sys/kern/subr_smp.c
==============================================================================
--- projects/largeSMP/sys/kern/subr_smp.c	Tue May 17 21:03:34 2011	(r222037)
+++ projects/largeSMP/sys/kern/subr_smp.c	Tue May 17 22:03:01 2011	(r222038)
@@ -53,10 +53,10 @@ __FBSDID("$FreeBSD$");
 #include "opt_sched.h"
 
 #ifdef SMP
-volatile cpuset_t stopped_cpus;
-volatile cpuset_t started_cpus;
-cpuset_t hlt_cpus_mask;

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-projects mailing list