From owner-p4-projects@FreeBSD.ORG  Tue Aug  2 16:45:50 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B975E16A423; Tue,  2 Aug 2005 16:45:49 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 5BDA716A41F
	for <perforce@freebsd.org>; Tue,  2 Aug 2005 16:45:49 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1629E43D4C
	for <perforce@freebsd.org>; Tue,  2 Aug 2005 16:45:48 +0000 (GMT)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j72Gjm10099351
	for <perforce@freebsd.org>; Tue, 2 Aug 2005 16:45:48 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j72Gjl2K099348
	for perforce@freebsd.org; Tue, 2 Aug 2005 16:45:47 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 2 Aug 2005 16:45:47 GMT
Message-Id: <200508021645.j72Gjl2K099348@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 81339 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Tue, 02 Aug 2005 16:45:51 -0000

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

Change 81339 by rwatson@rwatson_zoo on 2005/08/02 16:45:19

	Integrate netsmp branch:
	
	- System V IPC module dependencies.
	- GELI
	- if_gem locking, if_de locking
	- if_ixgb, if_em setup/teardown fixes
	- much sound driver locking and fixage
	- malloc(9), uma(9) statistics fixes
	- Don't mtx_assert when dumping
	- ule and threading fix
	- m_align
	- bpfstat
	- IPv6 scope fixage
	- bluetooth socket locking improvements

Affected files ...

.. //depot/projects/netsmp/src/sys/alpha/linux/linux_sysvec.c#2 integrate
.. //depot/projects/netsmp/src/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/netsmp/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/netsmp/src/sys/arm/include/atomic.h#2 integrate
.. //depot/projects/netsmp/src/sys/arm/include/clock.h#2 integrate
.. //depot/projects/netsmp/src/sys/arm/include/endian.h#2 integrate
.. //depot/projects/netsmp/src/sys/boot/common/console.c#2 integrate
.. //depot/projects/netsmp/src/sys/boot/common/help.common#2 integrate
.. //depot/projects/netsmp/src/sys/boot/forth/loader.conf#2 integrate
.. //depot/projects/netsmp/src/sys/boot/i386/libi386/smbios.c#2 integrate
.. //depot/projects/netsmp/src/sys/compat/linux/linux_ipc.c#2 integrate
.. //depot/projects/netsmp/src/sys/compat/svr4/svr4_ipc.c#2 integrate
.. //depot/projects/netsmp/src/sys/conf/NOTES#2 integrate
.. //depot/projects/netsmp/src/sys/conf/files#3 integrate
.. //depot/projects/netsmp/src/sys/conf/options#2 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_battery.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/acpica/acpi_pci_link.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/amr/amr.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/an/if_an.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/ata/ata-all.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/ath/if_ath.c#5 integrate
.. //depot/projects/netsmp/src/sys/dev/ath/if_athvar.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/drm/r300_cmdbuf.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/eisa/eisaconf.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/em/if_em.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/ep/if_ep.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/ep/if_epreg.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/fxp/if_fxp.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/gem/if_gem.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/gem/if_gem_pci.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/gem/if_gemvar.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/hwpmc/hwpmc_mod.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/ichsmb/ichsmb.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/ichsmb/ichsmb_pci.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/isp/isp_freebsd.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/ixgb/if_ixgb.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/mlx/mlx_pci.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/nve/if_nve.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/owi/if_owi.c#3 integrate
.. //depot/projects/netsmp/src/sys/dev/owi/if_owi_pccard.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/isa/ad1816.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/isa/ess.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/isa/mss.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/isa/sb8.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/isa/sbc.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pci/als4000.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pci/cmi.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pci/es137x.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pci/es137x.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pci/via8233.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pci/via82c686.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/ac97.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/buffer.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/channel.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/dsp.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/fake.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/feeder_fmt.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/feeder_rate.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/mixer.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/sound.c#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/sound.h#2 integrate
.. //depot/projects/netsmp/src/sys/dev/sound/pcm/vchan.c#2 integrate
.. //depot/projects/netsmp/src/sys/fs/devfs/devfs_vfsops.c#2 integrate
.. //depot/projects/netsmp/src/sys/geom/eli/g_eli.c#1 branch
.. //depot/projects/netsmp/src/sys/geom/eli/g_eli.h#1 branch
.. //depot/projects/netsmp/src/sys/geom/eli/g_eli_crypto.c#1 branch
.. //depot/projects/netsmp/src/sys/geom/eli/g_eli_ctl.c#1 branch
.. //depot/projects/netsmp/src/sys/geom/eli/g_eli_key.c#1 branch
.. //depot/projects/netsmp/src/sys/geom/eli/pkcs5v2.c#1 branch
.. //depot/projects/netsmp/src/sys/geom/eli/pkcs5v2.h#1 branch
.. //depot/projects/netsmp/src/sys/geom/geom_io.c#2 integrate
.. //depot/projects/netsmp/src/sys/geom/raid3/g_raid3.c#2 integrate
.. //depot/projects/netsmp/src/sys/geom/raid3/g_raid3.h#2 integrate
.. //depot/projects/netsmp/src/sys/geom/zero/g_zero.c#1 branch
.. //depot/projects/netsmp/src/sys/i386/conf/PAE#2 integrate
.. //depot/projects/netsmp/src/sys/i386/cpufreq/est.c#2 integrate
.. //depot/projects/netsmp/src/sys/i386/i386/io_apic.c#2 integrate
.. //depot/projects/netsmp/src/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/netsmp/src/sys/i386/ibcs2/ibcs2_ipc.c#2 integrate
.. //depot/projects/netsmp/src/sys/i386/linux/linux_machdep.c#2 integrate
.. //depot/projects/netsmp/src/sys/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/netsmp/src/sys/isa/isa_common.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_environment.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_malloc.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_mutex.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/kern_pmc.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/subr_hints.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/subr_mchain.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/uipc_mbuf.c#2 integrate
.. //depot/projects/netsmp/src/sys/kern/uipc_socket.c#2 integrate
.. //depot/projects/netsmp/src/sys/modules/geom/Makefile#2 integrate
.. //depot/projects/netsmp/src/sys/modules/geom/geom_eli/Makefile#1 branch
.. //depot/projects/netsmp/src/sys/modules/geom/geom_zero/Makefile#1 branch
.. //depot/projects/netsmp/src/sys/net/bpf.c#2 integrate
.. //depot/projects/netsmp/src/sys/net/bpfdesc.h#2 integrate
.. //depot/projects/netsmp/src/sys/net/if_bridge.c#3 integrate
.. //depot/projects/netsmp/src/sys/net/if_gif.c#2 integrate
.. //depot/projects/netsmp/src/sys/net/if_gre.c#2 integrate
.. //depot/projects/netsmp/src/sys/net/if_spppsubr.c#2 integrate
.. //depot/projects/netsmp/src/sys/net80211/ieee80211_input.c#3 integrate
.. //depot/projects/netsmp/src/sys/net80211/ieee80211_node.c#4 integrate
.. //depot/projects/netsmp/src/sys/net80211/ieee80211_output.c#3 integrate
.. //depot/projects/netsmp/src/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#2 integrate
.. //depot/projects/netsmp/src/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate
.. //depot/projects/netsmp/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet/icmp6.h#3 integrate
.. //depot/projects/netsmp/src/sys/netinet/ip_carp.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet/ip_gre.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet/tcp_subr.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet/tcp_usrreq.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/ah_aesxcbcmac.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/ah_core.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/icmp6.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/in6.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/in6.h#3 integrate
.. //depot/projects/netsmp/src/sys/netinet6/in6_cksum.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/in6_ifattach.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/in6_pcb.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/in6_proto.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/in6_src.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/in6_var.h#5 integrate
.. //depot/projects/netsmp/src/sys/netinet6/ip6_forward.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/ip6_input.c#3 integrate
.. //depot/projects/netsmp/src/sys/netinet6/ip6_mroute.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/ip6_output.c#4 integrate
.. //depot/projects/netsmp/src/sys/netinet6/ip6_var.h#3 integrate
.. //depot/projects/netsmp/src/sys/netinet6/ipsec.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/mld6.c#4 integrate
.. //depot/projects/netsmp/src/sys/netinet6/nd6.c#3 integrate
.. //depot/projects/netsmp/src/sys/netinet6/nd6_nbr.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/nd6_rtr.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/raw_ip6.c#3 integrate
.. //depot/projects/netsmp/src/sys/netinet6/route6.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/scope6.c#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/scope6_var.h#2 integrate
.. //depot/projects/netsmp/src/sys/netinet6/udp6_output.c#3 integrate
.. //depot/projects/netsmp/src/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/netsmp/src/sys/netkey/key.c#2 integrate
.. //depot/projects/netsmp/src/sys/netncp/ncp_rq.c#2 integrate
.. //depot/projects/netsmp/src/sys/netsmb/smb_subr.c#2 integrate
.. //depot/projects/netsmp/src/sys/nfsclient/nfs_node.c#3 integrate
.. //depot/projects/netsmp/src/sys/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/netsmp/src/sys/pci/if_de.c#4 integrate
.. //depot/projects/netsmp/src/sys/pci/if_devar.h#3 integrate
.. //depot/projects/netsmp/src/sys/pci/if_sis.c#3 integrate
.. //depot/projects/netsmp/src/sys/pci/if_xl.c#3 integrate
.. //depot/projects/netsmp/src/sys/powerpc/powerpc/machdep.c#2 integrate
.. //depot/projects/netsmp/src/sys/powerpc/powerpc/trap.c#2 integrate
.. //depot/projects/netsmp/src/sys/powerpc/powerpc/trap_subr.S#2 integrate
.. //depot/projects/netsmp/src/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate
.. //depot/projects/netsmp/src/sys/sparc64/include/cpufunc.h#2 integrate
.. //depot/projects/netsmp/src/sys/sys/mbuf.h#2 integrate
.. //depot/projects/netsmp/src/sys/sys/mchain.h#2 integrate
.. //depot/projects/netsmp/src/sys/sys/pmckern.h#2 integrate
.. //depot/projects/netsmp/src/sys/sys/soundcard.h#2 integrate
.. //depot/projects/netsmp/src/sys/ufs/ffs/ffs_softdep.c#2 integrate
.. //depot/projects/netsmp/src/sys/ufs/ffs/softdep.h#2 integrate
.. //depot/projects/netsmp/src/sys/vm/uma.h#2 integrate
.. //depot/projects/netsmp/src/sys/vm/uma_core.c#3 integrate

Differences ...

==== //depot/projects/netsmp/src/sys/alpha/linux/linux_sysvec.c#2 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.94 2005/01/29 23:11:57 sobomax Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.95 2005/07/29 19:40:38 jhb Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
@@ -66,10 +66,6 @@
 #undef szsigcode
 
 MODULE_VERSION(linux, 1);
-MODULE_DEPEND(linux, osf1, 1, 1, 1);
-MODULE_DEPEND(linux, sysvmsg, 1, 1, 1);
-MODULE_DEPEND(linux, sysvsem, 1, 1, 1);
-MODULE_DEPEND(linux, sysvshm, 1, 1, 1);
 
 MALLOC_DEFINE(M_LINUX, "linux", "Linux mode structures");
 
@@ -288,4 +284,5 @@
 
 DUMMY(rt_sigreturn);
 
+MODULE_DEPEND(linux, osf1, 1, 1, 1);
 DECLARE_MODULE(linuxelf, linux_elf_mod, SI_SUB_EXEC, SI_ORDER_ANY);

==== //depot/projects/netsmp/src/sys/amd64/conf/GENERIC#2 (text+ko) ====

@@ -16,7 +16,7 @@
 # If you are in doubt as to the purpose or necessity of a line, check first
 # in NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.440 2005/07/14 15:39:04 kensmith Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.441 2005/07/24 17:55:57 mux Exp $
 
 machine		amd64
 cpu		HAMMER
@@ -215,8 +215,7 @@
 # ISA Ethernet NICs.  pccard NICs included.
 device		cs		# Crystal Semiconductor CS89x0 NIC
 # 'device ed' requires 'device miibus'
-# XXX kvtop brokenness, pointer/int warnings
-#device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
+device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
 device		ex		# Intel EtherExpress Pro/10 and Pro/10+
 device		ep		# Etherlink III based cards
 device		fe		# Fujitsu MB8696x based cards

==== //depot/projects/netsmp/src/sys/amd64/linux32/linux32_sysvec.c#2 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.7 2005/03/23 08:27:58 das Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.8 2005/07/29 19:40:38 jhb Exp $");
 
 /* XXX we use functions that might not exist. */
 #include "opt_compat.h"
@@ -84,9 +84,6 @@
 #include <compat/linux/linux_util.h>
 
 MODULE_VERSION(linux, 1);
-MODULE_DEPEND(linux, sysvmsg, 1, 1, 1);
-MODULE_DEPEND(linux, sysvsem, 1, 1, 1);
-MODULE_DEPEND(linux, sysvshm, 1, 1, 1);
 
 MALLOC_DEFINE(M_LINUX, "linux", "Linux mode structures");
 

==== //depot/projects/netsmp/src/sys/arm/include/atomic.h#2 (text+ko) ====

@@ -33,7 +33,7 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/arm/include/atomic.h,v 1.9 2005/07/15 18:17:57 jhb Exp $
+ * $FreeBSD: src/sys/arm/include/atomic.h,v 1.10 2005/07/27 20:01:44 jhb Exp $
  */
 
 #ifndef	_MACHINE_ATOMIC_H_
@@ -77,8 +77,10 @@
 static __inline uint32_t
 __swp(uint32_t val, volatile uint32_t *ptr)
 {
-	__asm __volatile("swp	%0, %1, [%2]"
-	    : "=&r" (val) : "r" (val) , "r" (ptr) : "memory");
+	__asm __volatile("swp	%0, %2, [%3]"
+	    : "=&r" (val), "=m" (*ptr)
+	    : "r" (val) , "r" (ptr), "m" (*ptr)
+	    : "memory");
 	return (val);
 }
 

==== //depot/projects/netsmp/src/sys/arm/include/clock.h#2 (text+ko) ====

@@ -23,10 +23,13 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/arm/include/clock.h,v 1.1 2004/05/14 11:46:44 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/clock.h,v 1.2 2005/07/27 21:19:28 imp Exp $
  */
 
 #ifndef	_MACHINE_CLOCK_H_
 #define	_MACHINE_CLOCK_H_
 
+#define wall_cmos_clock 0
+#define adjkerntz 0
+
 #endif /* !_MACHINE_CLOCK_H_ */

==== //depot/projects/netsmp/src/sys/arm/include/endian.h#2 (text+ko) ====

@@ -27,7 +27,7 @@
  *
  *	@(#)endian.h	8.1 (Berkeley) 6/10/93
  * $NetBSD: endian.h,v 1.7 1999/08/21 05:53:51 simonb Exp $
- * $FreeBSD: src/sys/arm/include/endian.h,v 1.9 2005/05/24 21:43:16 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/endian.h,v 1.10 2005/07/27 19:59:21 jhb Exp $
  */
 
 #ifndef _ENDIAN_H_
@@ -100,11 +100,10 @@
 __bswap16_var(__uint16_t v)
 {
 	__asm __volatile(
-	    "mov    %0, %1, ror #8\n"
+	    "mov    %0, %0, ror #8\n"
 	    "orr    %0, %0, %0, lsr #16\n"
 	    "bic    %0, %0, %0, lsl #16"
-	    : "=r" (v)
-	    : "0" (v));
+	    : "+r" (v));
 	
 	return (v);
 }		

==== //depot/projects/netsmp/src/sys/boot/common/console.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/common/console.c,v 1.7 2005/05/27 19:30:59 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/common/console.c,v 1.8 2005/07/29 12:47:42 brian Exp $");
 
 #include <stand.h>
 #include <string.h>
@@ -217,7 +217,7 @@
 	if (*curpos == '\0')
 		continue;
 	cons = cons_find(curpos);
-	if (cons > 0) {
+	if (cons >= 0) {
 	    consoles[cons]->c_flags |= C_ACTIVEIN | C_ACTIVEOUT;
 	    consoles[cons]->c_init(0);
 	}

==== //depot/projects/netsmp/src/sys/boot/common/help.common#2 (text+ko) ====

@@ -223,7 +223,7 @@
 
 	set currdev=<device>
 
-	Selects the default device.  Syntax for devices is odd.
+	Selects the default device.  See lsdev for available devices.
 
 ################################################################################
 # Tset Sinit_path DSet the list of init candidates

==== //depot/projects/netsmp/src/sys/boot/forth/loader.conf#2 (text+ko) ====

@@ -6,7 +6,7 @@
 #
 # All arguments must be in double quotes.
 #
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.95 2005/05/19 23:03:02 sobomax Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.96 2005/07/29 12:41:37 brian Exp $
 
 ##############################################################
 ###  Basic configuration options  ############################
@@ -47,7 +47,7 @@
 				# allowed to interrupt autoboot process and
 				# escape to the loader prompt
 #beastie_disable="NO"		# Turn the beastie boot menu on and off
-#console="vidconsole"		# Set the current console
+#console="vidconsole"		# A comma separated list of console(s)
 #currdev="disk1s1a"		# Set the current device
 module_path="/boot/modules"	# Set the module search path
 #prompt="\\${interpret}"	# Set the command prompt
@@ -59,16 +59,18 @@
 ###  Kernel settings  ########################################
 ##############################################################
 
-			# The following boot_ variables are enabled
-			# by setting them to any value.
-#boot_askname=""	# Prompt the user for the name of the root device
-#boot_cdrom=""		# Attempt to mount root file system from CD-ROM
-#boot_ddb=""		# Instructs the kernel to start in the DDB debugger
-#boot_gdb=""		# Selects gdb-remote mode for the kernel debugger
-#boot_multicons=""	# Use multiple consoles
-#boot_serial=""		# Use serial console
-#boot_single=""		# Start system in single-user mode
-#boot_verbose=""	# Causes extra debugging information to be printed
+# The following boot_ variables are enabled by setting them to any value.
+# Their presence in the kernel environment (see kenv(1)) has the same
+# effect as setting the given boot flag (see boot(8)).
+
+#boot_askname=""	# -a: Prompt the user for the name of the root device
+#boot_cdrom=""		# -C: Attempt to mount root file system from CD-ROM
+#boot_ddb=""		# -d: Instructs the kernel to start in the DDB debugger
+#boot_gdb=""		# -g: Selects gdb-remote mode for the kernel debugger
+#boot_multicons=""	# -D: Use multiple consoles
+#boot_serial=""		# -h: Use serial console
+#boot_single=""		# -s: Start system in single-user mode
+#boot_verbose=""	# -v: Causes extra debugging information to be printed
 #init_path="/sbin/init:/sbin/oinit:/sbin/init.bak:/rescue/init:/stand/sysinstall"
 			# Sets the list of init candidates
 

==== //depot/projects/netsmp/src/sys/boot/i386/libi386/smbios.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.1 2005/07/14 19:52:22 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/smbios.c,v 1.2 2005/07/27 19:11:10 jkim Exp $");
 
 #include <stand.h>
 #include <bootstrap.h>
@@ -72,9 +72,6 @@
 	if (smbios == NULL)
 		return;
 
-	/* export values from the SMBIOS */
-	setenv("hint.smbios.0.enabled", "YES", 1);
-
 	length = *(u_int16_t *)(smbios + 0x16);	/* Structure Table Length */
 	paddr = *(u_int32_t *)(smbios + 0x18);	/* Structure Table Address */
 	count = *(u_int16_t *)(smbios + 0x1c);	/* No of SMBIOS Structures */
@@ -91,26 +88,26 @@
 
 	switch(dmi[0]) {
 	case 0:		/* Type 0: BIOS */
-		smbios_setenv("hint.smbios.0.bios.vendor", dmi, 0x04);
-		smbios_setenv("hint.smbios.0.bios.version", dmi, 0x05);
-		smbios_setenv("hint.smbios.0.bios.reldate", dmi, 0x08);
+		smbios_setenv("smbios.bios.vendor", dmi, 0x04);
+		smbios_setenv("smbios.bios.version", dmi, 0x05);
+		smbios_setenv("smbios.bios.reldate", dmi, 0x08);
 		break;
 
 	case 1:		/* Type 1: System */
-		smbios_setenv("hint.smbios.0.system.maker", dmi, 0x04);
-		smbios_setenv("hint.smbios.0.system.product", dmi, 0x05);
-		smbios_setenv("hint.smbios.0.system.version", dmi, 0x06);
+		smbios_setenv("smbios.system.maker", dmi, 0x04);
+		smbios_setenv("smbios.system.product", dmi, 0x05);
+		smbios_setenv("smbios.system.version", dmi, 0x06);
 		break;
 
 	case 2:		/* Type 2: Base Board (or Module) */
-		smbios_setenv("hint.smbios.0.planar.maker", dmi, 0x04);
-		smbios_setenv("hint.smbios.0.planar.product", dmi, 0x05);
-		smbios_setenv("hint.smbios.0.planar.version", dmi, 0x06);
+		smbios_setenv("smbios.planar.maker", dmi, 0x04);
+		smbios_setenv("smbios.planar.product", dmi, 0x05);
+		smbios_setenv("smbios.planar.version", dmi, 0x06);
 		break;
 
 	case 3:		/* Type 3: System Enclosure or Chassis */
-		smbios_setenv("hint.smbios.0.chassis.maker", dmi, 0x04);
-		smbios_setenv("hint.smbios.0.chassis.version", dmi, 0x06);
+		smbios_setenv("smbios.chassis.maker", dmi, 0x04);
+		smbios_setenv("smbios.chassis.version", dmi, 0x06);
 		break;
 
 	default: /* skip other types */

==== //depot/projects/netsmp/src/sys/compat/linux/linux_ipc.c#2 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.43 2005/02/11 13:46:55 sobomax Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.44 2005/07/29 19:40:39 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -815,3 +815,7 @@
 	return EINVAL;
     }
 }
+
+MODULE_DEPEND(linux, sysvmsg, 1, 1, 1);
+MODULE_DEPEND(linux, sysvsem, 1, 1, 1);
+MODULE_DEPEND(linux, sysvshm, 1, 1, 1);

==== //depot/projects/netsmp/src/sys/compat/svr4/svr4_ipc.c#2 (text+ko) ====

@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ipc.c,v 1.16 2005/07/07 19:25:47 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_ipc.c,v 1.17 2005/07/29 19:41:04 jhb Exp $");
 
 #include "opt_sysvipc.h"
 
@@ -385,6 +385,8 @@
 		return EINVAL;
 	}
 }
+
+MODULE_DEPEND(svr4elf, sysvsem, 1, 1, 1);
 #endif
 
 #ifdef SYSVMSG
@@ -579,6 +581,8 @@
 		return EINVAL;
 	}
 }
+
+MODULE_DEPEND(svr4elf, sysvmsg, 1, 1, 1);
 #endif
 
 #ifdef SYSVSHM
@@ -788,4 +792,6 @@
 		return ENOSYS;
 	}
 }
+
+MODULE_DEPEND(svr4elf, sysvshm, 1, 1, 1);
 #endif /* SYSVSHM */

==== //depot/projects/netsmp/src/sys/conf/NOTES#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1326 2005/07/14 15:57:00 takawata Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1328 2005/07/27 21:47:55 pjd Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -131,6 +131,7 @@
 options 	GEOM_BDE		# Disk encryption.
 options 	GEOM_BSD		# BSD disklabels
 options 	GEOM_CONCAT		# Disk concatenation.
+options 	GEOM_ELI		# Disk encryption.
 options 	GEOM_FOX		# Redundant path mitigation
 options 	GEOM_GATE		# Userland services.
 options 	GEOM_GPT		# GPT partitioning
@@ -145,6 +146,7 @@
 options 	GEOM_SUNLABEL		# Sun/Solaris partitioning
 options 	GEOM_UZIP		# Read-only compressed disks
 options 	GEOM_VOL		# Volume names from UFS superblock
+options 	GEOM_ZERO		# Peformance testing helper.
 
 #
 # The root device and filesystem type can be compiled in;

==== //depot/projects/netsmp/src/sys/conf/files#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1036 2005/07/20 21:10:56 anholt Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1038 2005/07/27 21:47:55 pjd Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -1028,6 +1028,11 @@
 geom/bde/g_bde_lock.c		optional geom_bde
 geom/bde/g_bde_work.c		optional geom_bde
 geom/concat/g_concat.c		optional geom_concat
+geom/eli/g_eli.c		optional geom_eli
+geom/eli/g_eli_crypto.c		optional geom_eli
+geom/eli/g_eli_ctl.c		optional geom_eli
+geom/eli/g_eli_key.c		optional geom_eli
+geom/eli/pkcs5v2.c		optional geom_eli
 geom/gate/g_gate.c		optional geom_gate
 geom/geom_aes.c			optional geom_aes
 geom/geom_apple.c		optional geom_apple
@@ -1066,6 +1071,7 @@
 geom/shsec/g_shsec.c		optional geom_shsec
 geom/stripe/g_stripe.c		optional geom_stripe
 geom/uzip/g_uzip.c		optional geom_uzip
+geom/zero/g_zero.c		optional geom_zero
 gnu/fs/ext2fs/ext2_alloc.c		optional ext2fs \
 	warning "kernel contains GPL contaminated ext2fs filesystem"
 gnu/fs/ext2fs/ext2_balloc.c	optional ext2fs

==== //depot/projects/netsmp/src/sys/conf/options#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.511 2005/07/15 05:12:49 takawata Exp $
+# $FreeBSD: src/sys/conf/options,v 1.513 2005/07/27 21:47:55 pjd Exp $
 #
 #        On the handling of kernel options
 #
@@ -76,6 +76,7 @@
 GEOM_BDE	opt_geom.h
 GEOM_BSD	opt_geom.h
 GEOM_CONCAT	opt_geom.h
+GEOM_ELI	opt_geom.h
 GEOM_FOX	opt_geom.h
 GEOM_GATE	opt_geom.h
 GEOM_GPT	opt_geom.h
@@ -90,6 +91,7 @@
 GEOM_SUNLABEL	opt_geom.h
 GEOM_UZIP	opt_geom.h
 GEOM_VOL	opt_geom.h
+GEOM_ZERO	opt_geom.h
 KSTACK_MAX_PAGES
 KSTACK_PAGES
 KTRACE

==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_battery.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.13 2005/07/23 19:35:59 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_battery.c,v 1.16 2005/07/28 19:34:51 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
@@ -143,9 +143,9 @@
      * Allocate storage for all _BST data, their derived battinfo data,
      * and the current battery's _BIF data.
      */
-    bst = malloc(devcount * sizeof(*bst), M_TEMP, M_WAITOK);
-    bi = malloc(devcount * sizeof(*bi), M_TEMP, M_WAITOK);
-    bif = malloc(sizeof(*bif), M_TEMP, M_WAITOK);
+    bst = malloc(devcount * sizeof(*bst), M_TEMP, M_WAITOK | M_ZERO);
+    bi = malloc(devcount * sizeof(*bi), M_TEMP, M_WAITOK | M_ZERO);
+    bif = malloc(sizeof(*bif), M_TEMP, M_WAITOK | M_ZERO);
 
     /*
      * Pass 1:  for each battery that is present and valid, get its status,
@@ -244,6 +244,13 @@
 	    battinfo->state = bi[dev_idx].state;
 	    battinfo->rate = bst[dev_idx].rate;
 	}
+
+	/*
+	 * If the queried battery has no discharge rate or is charging,
+	 * report that we don't know the remaining time.
+	 */
+	if (valid_rate == 0 || (battinfo->state & ACPI_BATT_STAT_CHARGING))
+	    battinfo->min = -1;
     } else
 	acpi_reset_battinfo(battinfo);
 
@@ -364,27 +371,31 @@
     sysctl_ctx_init(&acpi_battery_sysctl_ctx);
     acpi_battery_sysctl_tree = SYSCTL_ADD_NODE(&acpi_battery_sysctl_ctx,
 	SYSCTL_CHILDREN(sc->acpi_sysctl_tree), OID_AUTO, "battery", CTLFLAG_RD,
-	0, "");
+	0, "battery status and info");
     SYSCTL_ADD_PROC(&acpi_battery_sysctl_ctx,
 	SYSCTL_CHILDREN(acpi_battery_sysctl_tree),
 	OID_AUTO, "life", CTLTYPE_INT | CTLFLAG_RD,
-	&acpi_battery_battinfo.cap, 0, acpi_battery_sysctl, "I", "");
+	&acpi_battery_battinfo.cap, 0, acpi_battery_sysctl, "I",
+	"percent capacity remaining");
     SYSCTL_ADD_PROC(&acpi_battery_sysctl_ctx,
 	SYSCTL_CHILDREN(acpi_battery_sysctl_tree),
 	OID_AUTO, "time", CTLTYPE_INT | CTLFLAG_RD,
-	&acpi_battery_battinfo.min, 0, acpi_battery_sysctl, "I", "");
+	&acpi_battery_battinfo.min, 0, acpi_battery_sysctl, "I",
+	"remaining time in minutes");
     SYSCTL_ADD_PROC(&acpi_battery_sysctl_ctx,
 	SYSCTL_CHILDREN(acpi_battery_sysctl_tree),
 	OID_AUTO, "state", CTLTYPE_INT | CTLFLAG_RD,
-	&acpi_battery_battinfo.state, 0, acpi_battery_sysctl, "I", "");
+	&acpi_battery_battinfo.state, 0, acpi_battery_sysctl, "I",
+	"current status flags");
     SYSCTL_ADD_PROC(&acpi_battery_sysctl_ctx,
 	SYSCTL_CHILDREN(acpi_battery_sysctl_tree),
 	OID_AUTO, "units", CTLTYPE_INT | CTLFLAG_RD,
-	NULL, 0, acpi_battery_units_sysctl, "I", "");
+	NULL, 0, acpi_battery_units_sysctl, "I", "number of batteries");
     SYSCTL_ADD_INT(&acpi_battery_sysctl_ctx,
 	SYSCTL_CHILDREN(acpi_battery_sysctl_tree),
 	OID_AUTO, "info_expire", CTLFLAG_RD | CTLFLAG_RW,
-	&acpi_battery_info_expire, 0, "");
+	&acpi_battery_info_expire, 0,
+	"time in seconds until info is refreshed");
 
     acpi_batteries_initted = TRUE;
 

==== //depot/projects/netsmp/src/sys/dev/acpica/acpi_pci_link.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.44 2005/01/18 20:18:46 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci_link.c,v 1.45 2005/07/27 15:21:32 jhb Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
@@ -955,8 +955,8 @@
 		}
 	}
 
-	if (bootverbose) {
-		if (PCI_INTERRUPT_VALID(best_irq))
+	if (PCI_INTERRUPT_VALID(best_irq)) {
+		if (bootverbose)
 			device_printf(dev, "Picked IRQ %u with weight %d\n",
 			    best_irq, best_weight);
 	} else

==== //depot/projects/netsmp/src/sys/dev/amr/amr.c#2 (text+ko) ====

@@ -56,7 +56,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.65 2005/06/23 00:21:25 ps Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/amr/amr.c,v 1.67 2005/07/29 01:53:45 ps Exp $");
 
 /*
  * Driver for the AMI MegaRaid family of controllers.
@@ -878,13 +878,13 @@
 static void
 amr_completeio(struct amr_command *ac)
 {
-    struct amr_softc	*sc = ac->ac_sc;
+    struct amrd_softc	*sc = ac->ac_bio->bio_disk->d_drv1;
 
     if (ac->ac_status != AMR_STATUS_SUCCESS) {	/* could be more verbose here? */
 	ac->ac_bio->bio_error = EIO;
 	ac->ac_bio->bio_flags |= BIO_ERROR;
 
-	device_printf(sc->amr_dev, "I/O error - 0x%x\n", ac->ac_status);
+	device_printf(sc->amrd_dev, "I/O error - 0x%x\n", ac->ac_status);
 /*	amr_printcommand(ac);*/
     }
     amrd_intr(ac->ac_bio);
@@ -962,7 +962,7 @@
 static int
 amr_wait_command(struct amr_command *ac)
 {
-    int			error, count;
+    int			error = 0;
     
     debug_called(1);
 
@@ -971,12 +971,10 @@
     if ((error = amr_start(ac)) != 0)
 	return(error);
     
-    count = 0;
-    /* XXX better timeout? */
-    while ((ac->ac_flags & AMR_CMD_BUSY) && (count < 30)) {
-	msleep(ac, &ac->ac_sc->amr_io_lock, PRIBIO | PCATCH, "amrwcmd", hz);
+    while ((ac->ac_flags & AMR_CMD_BUSY) && (error != EWOULDBLOCK)) {
+	error = msleep(ac, &ac->ac_sc->amr_io_lock, PRIBIO, "amrwcmd", 0);
     }
-    return(0);
+    return(error);
 }
 
 /********************************************************************************

==== //depot/projects/netsmp/src/sys/dev/an/if_an.c#2 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.67 2005/06/14 14:50:40 delphij Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/an/if_an.c,v 1.69 2005/08/02 16:03:51 emax Exp $");
 
 /*
  * The Aironet 4500/4800 series cards come in PCMCIA, ISA and PCI form.
@@ -832,12 +832,12 @@
 	}
 	AN_LOCK(sc);
 	an_stop(sc);
+	sc->an_gone = 1;
 	ifmedia_removeall(&sc->an_ifmedia);
 	ifp->if_flags &= ~IFF_RUNNING;
+	AN_UNLOCK(sc);
 	ether_ifdetach(ifp);
 	if_free(ifp);
-	sc->an_gone = 1;
-	AN_UNLOCK(sc);
 	bus_teardown_intr(dev, sc->irq_res, sc->irq_handle);
 	an_release_resources(dev);
 	mtx_destroy(&sc->an_mtx);

==== //depot/projects/netsmp/src/sys/dev/ata/ata-all.h#2 (text+ko) ====

@@ -25,7 +25,7 @@
  * (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/sys/dev/ata/ata-all.h,v 1.103 2005/05/16 13:07:26 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.104 2005/07/29 18:14:06 sos Exp $
  */
 
 /* ATA register defines */
@@ -434,7 +434,6 @@
     int error;
 };
 
-struct ata_channel {};
 /* structure holding DMA related information */
 struct ata_dma {
     bus_dma_tag_t               dmatag;         /* parent DMA tag */

==== //depot/projects/netsmp/src/sys/dev/ath/if_ath.c#5 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.97 2005/07/23 05:34:29 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.98 2005/07/24 05:11:39 sam Exp $");
 
 /*
  * Driver for the Atheros Wireless LAN controller.
@@ -522,8 +522,7 @@
 	 * all parts.  We're a bit pedantic here as all parts
 	 * support a global cap.
 	 */
-	sc->sc_hastpc = ath_hal_hastpc(ah);
-	if (sc->sc_hastpc || ath_hal_hastxpowlimit(ah))
+	if (ath_hal_hastpc(ah) || ath_hal_hastxpowlimit(ah))
 		ic->ic_caps |= IEEE80211_C_TXPMGT;
 
 	/*
@@ -547,10 +546,6 @@
 	/*
 	 * Query the hal about antenna support.
 	 */
-	if (ath_hal_hasdiversity(ah)) {
-		sc->sc_hasdiversity = 1;
-		sc->sc_diversity = ath_hal_getdiversity(ah);
-	}
 	sc->sc_defant = ath_hal_getdefantenna(ah);
 
 	/*
@@ -880,6 +875,11 @@
 	 * but it's best done after a reset.
 	 */
 	ath_update_txpow(sc);
+	/*
+	 * Likewise this is set during reset so update
+	 * state cached in the driver.
+	 */
+	sc->sc_diversity = ath_hal_getdiversity(ah);
 
 	/*
 	 * Setup the hardware after reset: the key cache
@@ -1031,6 +1031,7 @@
 		if_printf(ifp, "%s: unable to reset hardware; hal status %u\n",
 			__func__, status);
 	ath_update_txpow(sc);		/* update tx power state */
+	sc->sc_diversity = ath_hal_getdiversity(ah);
 	if (ath_startrecv(sc) != 0)	/* restart recv */
 		if_printf(ifp, "%s: unable to start recv logic\n", __func__);
 	/*
@@ -4042,6 +4043,7 @@
 		}
 		sc->sc_curchan = hchan;
 		ath_update_txpow(sc);		/* update tx power state */
+		sc->sc_diversity = ath_hal_getdiversity(ah);
 
 		/*
 		 * Re-enable rx framework.
@@ -4822,14 +4824,16 @@
 ath_sysctl_diversity(SYSCTL_HANDLER_ARGS)
 {
 	struct ath_softc *sc = arg1;
-	u_int diversity = sc->sc_diversity;
+	u_int diversity = ath_hal_getdiversity(sc->sc_ah);
 	int error;
 
 	error = sysctl_handle_int(oidp, &diversity, 0, req);
 	if (error || !req->newptr)
 		return error;
+	if (!ath_hal_setdiversity(sc->sc_ah, diversity))
+		return EINVAL;
 	sc->sc_diversity = diversity;
-	return !ath_hal_setdiversity(sc->sc_ah, diversity) ? EINVAL : 0;
+	return 0;
 }
 
 static int
@@ -4880,6 +4884,7 @@
 {
 	struct sysctl_ctx_list *ctx = device_get_sysctl_ctx(sc->sc_dev);
 	struct sysctl_oid *tree = device_get_sysctl_tree(sc->sc_dev);
+	struct ath_hal *ah = sc->sc_ah;
 
 	ath_hal_getcountrycode(sc->sc_ah, &sc->sc_countrycode);
 	SYSCTL_ADD_INT(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
@@ -4921,7 +4926,7 @@
 	SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
 		"rxantenna", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
 		ath_sysctl_rxantenna, "I", "default/rx antenna");
-	if (sc->sc_hasdiversity)
+	if (ath_hal_hasdiversity(ah))
 		SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
 			"diversity", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
 			ath_sysctl_diversity, "I", "antenna diversity");
@@ -4935,7 +4940,7 @@
 	SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
 		"tpscale", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
 		ath_sysctl_tpscale, "I", "tx power scaling");
-	if (sc->sc_hastpc)
+	if (ath_hal_hastpc(ah))
 		SYSCTL_ADD_PROC(ctx, SYSCTL_CHILDREN(tree), OID_AUTO,
 			"tpc", CTLTYPE_INT | CTLFLAG_RW, sc, 0,
 			ath_sysctl_tpc, "I", "enable/disable per-packet TPC");

==== //depot/projects/netsmp/src/sys/dev/ath/if_athvar.h#2 (text+ko) ====

@@ -33,7 +33,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGES.
  *
- * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.27 2005/07/07 00:04:50 sam Exp $
+ * $FreeBSD: src/sys/dev/ath/if_athvar.h,v 1.28 2005/07/24 05:11:39 sam Exp $
  */
 
 /*
@@ -199,10 +199,8 @@
 				sc_softled : 1,	/* enable LED gpio status */
 				sc_splitmic: 1,	/* split TKIP MIC keys */
 				sc_needmib : 1,	/* enable MIB stats intr */
-				sc_hasdiversity : 1,/* rx diversity available */
 				sc_diversity : 1,/* enable rx diversity */
 				sc_hasveol : 1,	/* tx VEOL support */
-				sc_hastpc  : 1,	/* per-packet TPC support */
 				sc_ledstate: 1,	/* LED on/off state */
 				sc_blinking: 1,	/* LED blink operation active */
 				sc_mcastkey: 1,	/* mcast key cache search */

==== //depot/projects/netsmp/src/sys/dev/drm/r300_cmdbuf.c#2 (text+ko) ====

@@ -30,7 +30,7 @@
  * Authors:
  *    Nicolai Haehnle <prefect_@gmx.net>
  *
- * $FreeBSD: src/sys/dev/drm/r300_cmdbuf.c,v 1.1 2005/07/20 21:10:57 anholt Exp $
+ * $FreeBSD: src/sys/dev/drm/r300_cmdbuf.c,v 1.2 2005/08/01 17:50:19 anholt Exp $
  */
 
 #include "dev/drm/drmP.h"
@@ -625,7 +625,7 @@
 	drm_radeon_private_t *dev_priv = dev->dev_private;
 	drm_radeon_buf_priv_t *buf_priv = buf->dev_private;
 
-	buf_priv->age = dev_priv->sarea_priv->last_dispatch+1;
+	buf_priv->age = ++dev_priv->sarea_priv->last_dispatch;
 	buf->pending = 1;
 	buf->used = 0;
 }
@@ -790,8 +790,6 @@
 	if (emit_dispatch_age) {
 		RING_LOCALS;
 
-		dev_priv->sarea_priv->last_dispatch++;
-
 		/* Emit the vertex buffer age */
 		BEGIN_RING(2);
 		RADEON_DISPATCH_AGE(dev_priv->sarea_priv->last_dispatch);

==== //depot/projects/netsmp/src/sys/dev/eisa/eisaconf.c#2 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/eisa/eisaconf.c,v 1.72 2005/03/17 17:36:07 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/eisa/eisaconf.c,v 1.73 2005/08/01 07:09:15 imp Exp $");
 
 #include "opt_eisa.h"
 
@@ -93,10 +93,9 @@
 static devclass_t eisa_devclass;
 
 static int eisa_probe_slot(int slot, eisa_id_t *eisa_id);
-static void eisa_reg_print (device_t, char *, char *, int *);
-static struct irq_node * eisa_find_irq(struct eisa_device *e_dev, int rid);
-static struct resvaddr * eisa_find_maddr(struct eisa_device *e_dev, int rid);
-static struct resvaddr * eisa_find_ioaddr(struct eisa_device *e_dev, int rid);
+static struct irq_node *eisa_find_irq(struct eisa_device *e_dev, int rid);
+static struct resvaddr *eisa_find_maddr(struct eisa_device *e_dev, int rid);
+static struct resvaddr *eisa_find_ioaddr(struct eisa_device *e_dev, int rid);
 
 static int
 mainboard_probe(device_t dev)
@@ -231,94 +230,47 @@
 	u_int32_t	eisa_id = eisa_get_id(child);
 	u_int8_t	slot = eisa_get_slot(child);
 
-	device_printf(dev, "unknown card %c%c%c%03x%01x (0x%08x) at slot %d\n",
+	device_printf(dev, "%c%c%c%03x%01x (0x%08x) at slot %d (no driver attached)\n",
 	    EISA_MFCTR_CHAR0(eisa_id), EISA_MFCTR_CHAR1(eisa_id),
 	    EISA_MFCTR_CHAR2(eisa_id), EISA_PRODUCT_ID(eisa_id),
 	    EISA_REVISION_ID(eisa_id), eisa_id, slot);
 	return;
 }
 

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