From owner-p4-projects@FreeBSD.ORG  Fri Jun 12 13:46:20 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 46DAA1065707; Fri, 12 Jun 2009 13:46:20 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F3F031065705
	for <perforce@freebsd.org>; Fri, 12 Jun 2009 13:46:19 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DF9AB8FC27
	for <perforce@freebsd.org>; Fri, 12 Jun 2009 13:46:19 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n5CDkJWJ075010
	for <perforce@freebsd.org>; Fri, 12 Jun 2009 13:46:19 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n5CDkJFZ075008
	for perforce@freebsd.org; Fri, 12 Jun 2009 13:46:19 GMT
	(envelope-from jhb@freebsd.org)
Date: Fri, 12 Jun 2009 13:46:19 GMT
Message-Id: <200906121346.n5CDkJFZ075008@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 164170 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: Fri, 12 Jun 2009 13:46:21 -0000

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

Change 164170 by jhb@jhb_jhbbsd on 2009/06/12 13:45:50

	IFC @164168

Affected files ...

.. //depot/projects/smpng/share/man/man9/Makefile#5 integrate
.. //depot/projects/smpng/share/man/man9/devclass_add_driver.9#2 delete
.. //depot/projects/smpng/sys/amd64/conf/DEFAULTS#14 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#79 integrate
.. //depot/projects/smpng/sys/arm/arm/intr.c#22 integrate
.. //depot/projects/smpng/sys/arm/arm/locore.S#20 integrate
.. //depot/projects/smpng/sys/arm/at91/at91.c#20 integrate
.. //depot/projects/smpng/sys/arm/at91/at91_cfata.c#3 integrate
.. //depot/projects/smpng/sys/arm/at91/at91_mci.c#13 integrate
.. //depot/projects/smpng/sys/arm/at91/at91_twi.c#14 integrate
.. //depot/projects/smpng/sys/arm/at91/if_ate.c#22 integrate
.. //depot/projects/smpng/sys/arm/include/intr.h#12 integrate
.. //depot/projects/smpng/sys/arm/mv/ic.c#3 integrate
.. //depot/projects/smpng/sys/arm/mv/twsi.c#2 integrate
.. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_irqhandler.c#7 integrate
.. //depot/projects/smpng/sys/arm/xscale/i80321/i80321.c#8 integrate
.. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_pci.c#12 integrate
.. //depot/projects/smpng/sys/arm/xscale/i8134x/i81342.c#2 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_ata.c#6 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_led.c#3 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/cambria_led.c#2 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#13 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425.c#11 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_iic.c#5 integrate
.. //depot/projects/smpng/sys/arm/xscale/pxa/pxa_icu.c#2 integrate
.. //depot/projects/smpng/sys/boot/forth/loader.conf#62 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_target.c#27 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#4 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#4 integrate
.. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#53 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#53 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscalls.c#53 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_sysent.c#54 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/syscalls.master#57 integrate
.. //depot/projects/smpng/sys/conf/NOTES#171 integrate
.. //depot/projects/smpng/sys/conf/files#243 integrate
.. //depot/projects/smpng/sys/conf/options#170 integrate
.. //depot/projects/smpng/sys/contrib/pf/net/if_pflog.c#18 integrate
.. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#35 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#70 integrate
.. //depot/projects/smpng/sys/dev/agp/agp_ali.c#2 integrate
.. //depot/projects/smpng/sys/dev/agp/agp_amd.c#2 integrate
.. //depot/projects/smpng/sys/dev/agp/agp_ati.c#2 integrate
.. //depot/projects/smpng/sys/dev/agp/agp_nvidia.c#3 integrate
.. //depot/projects/smpng/sys/dev/agp/agp_sis.c#2 integrate
.. //depot/projects/smpng/sys/dev/alc/if_alc.c#1 branch
.. //depot/projects/smpng/sys/dev/alc/if_alcreg.h#1 branch
.. //depot/projects/smpng/sys/dev/alc/if_alcvar.h#1 branch
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-acerlabs.c#4 integrate
.. //depot/projects/smpng/sys/dev/cfi/cfi_core.c#5 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#22 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_multiq.c#8 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#18 integrate
.. //depot/projects/smpng/sys/dev/e1000/if_igb.c#8 integrate
.. //depot/projects/smpng/sys/dev/eisa/eisaconf.c#13 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#91 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#60 integrate
.. //depot/projects/smpng/sys/dev/ksyms/ksyms.c#3 integrate
.. //depot/projects/smpng/sys/dev/mca/mca_bus.c#6 integrate
.. //depot/projects/smpng/sys/dev/mge/if_mge.c#5 integrate
.. //depot/projects/smpng/sys/dev/ncv/ncr53c500_pccard.c#22 integrate
.. //depot/projects/smpng/sys/dev/nsp/nsp_pccard.c#17 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_standard.c#3 integrate
.. //depot/projects/smpng/sys/dev/pcf/pcf.c#3 integrate
.. //depot/projects/smpng/sys/dev/pcf/pcfvar.h#5 integrate
.. //depot/projects/smpng/sys/dev/pdq/if_fpa.c#13 integrate
.. //depot/projects/smpng/sys/dev/smc/if_smc.c#3 integrate
.. //depot/projects/smpng/sys/dev/smc/if_smcvar.h#2 integrate
.. //depot/projects/smpng/sys/dev/snc/if_snc.c#7 integrate
.. //depot/projects/smpng/sys/dev/snc/if_sncvar.h#4 integrate
.. //depot/projects/smpng/sys/dev/sound/midi/midi.c#18 integrate
.. //depot/projects/smpng/sys/dev/sound/midi/mpu401.c#6 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/channel.h#18 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/mixer.h#11 integrate
.. //depot/projects/smpng/sys/dev/sound/pcm/sound.h#37 integrate
.. //depot/projects/smpng/sys/dev/spibus/spibus.c#4 integrate
.. //depot/projects/smpng/sys/dev/stg/tmc18c30.h#2 integrate
.. //depot/projects/smpng/sys/dev/stg/tmc18c30_subr.c#7 integrate
.. //depot/projects/smpng/sys/dev/syscons/teken/teken_demo.c#3 integrate
.. //depot/projects/smpng/sys/dev/syscons/teken/teken_stress.c#2 integrate
.. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#27 integrate
.. //depot/projects/smpng/sys/dev/wb/if_wb.c#2 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi.c#94 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wivar.h#30 integrate
.. //depot/projects/smpng/sys/fs/cd9660/cd9660_vnops.c#7 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#82 integrate
.. //depot/projects/smpng/sys/fs/fifofs/fifo_vnops.c#51 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vnops.c#49 integrate
.. //depot/projects/smpng/sys/fs/nfsclient/nfs_clbio.c#5 integrate
.. //depot/projects/smpng/sys/fs/nfsclient/nfs_clvnops.c#5 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs_vnops.c#59 integrate
.. //depot/projects/smpng/sys/geom/geom.h#55 integrate
.. //depot/projects/smpng/sys/geom/geom_io.c#50 integrate
.. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#10 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_machdep.c#33 integrate
.. //depot/projects/smpng/sys/i386/conf/DEFAULTS#16 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#110 integrate
.. //depot/projects/smpng/sys/i386/include/legacyvar.h#7 integrate
.. //depot/projects/smpng/sys/i386/pci/pci_bus.c#35 integrate
.. //depot/projects/smpng/sys/kern/init_main.c#80 integrate
.. //depot/projects/smpng/sys/kern/kern_event.c#58 integrate
.. //depot/projects/smpng/sys/kern/kern_fork.c#121 integrate
.. //depot/projects/smpng/sys/kern/kern_jail.c#71 integrate
.. //depot/projects/smpng/sys/kern/kern_lockf.c#28 integrate
.. //depot/projects/smpng/sys/kern/link_elf_obj.c#25 integrate
.. //depot/projects/smpng/sys/kern/linker_if.m#8 integrate
.. //depot/projects/smpng/sys/kern/subr_acl_nfs4.c#1 branch
.. //depot/projects/smpng/sys/kern/subr_bus.c#81 integrate
.. //depot/projects/smpng/sys/kern/sys_pipe.c#65 integrate
.. //depot/projects/smpng/sys/kern/sysv_shm.c#44 integrate
.. //depot/projects/smpng/sys/kern/tty.c#93 integrate
.. //depot/projects/smpng/sys/kern/tty_pts.c#19 integrate
.. //depot/projects/smpng/sys/kern/uipc_mqueue.c#22 integrate
.. //depot/projects/smpng/sys/kern/uipc_socket.c#125 integrate
.. //depot/projects/smpng/sys/kern/uipc_syscalls.c#119 integrate
.. //depot/projects/smpng/sys/kern/vfs_aio.c#86 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#169 integrate
.. //depot/projects/smpng/sys/kern/vnode_if.src#44 integrate
.. //depot/projects/smpng/sys/libkern/jenkins.h#1 branch
.. //depot/projects/smpng/sys/modules/Makefile#163 integrate
.. //depot/projects/smpng/sys/modules/alc/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/sound/sound/Makefile#10 integrate
.. //depot/projects/smpng/sys/net/bpf.c#87 integrate
.. //depot/projects/smpng/sys/net/flowtable.c#3 integrate
.. //depot/projects/smpng/sys/net/flowtable.h#3 integrate
.. //depot/projects/smpng/sys/net/if.c#121 integrate
.. //depot/projects/smpng/sys/net/if_arcsubr.c#27 integrate
.. //depot/projects/smpng/sys/net/if_bridge.c#59 integrate
.. //depot/projects/smpng/sys/net/if_ethersubr.c#99 integrate
.. //depot/projects/smpng/sys/net/if_fddisubr.c#37 integrate
.. //depot/projects/smpng/sys/net/if_fwsubr.c#24 integrate
.. //depot/projects/smpng/sys/net/if_gif.c#52 integrate
.. //depot/projects/smpng/sys/net/if_iso88025subr.c#35 integrate
.. //depot/projects/smpng/sys/net/if_tap.c#51 integrate
.. //depot/projects/smpng/sys/net/if_tun.c#61 integrate
.. //depot/projects/smpng/sys/net/if_var.h#65 integrate
.. //depot/projects/smpng/sys/net/rtsock.c#74 integrate
.. //depot/projects/smpng/sys/net80211/_ieee80211.h#16 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211.c#42 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211.h#23 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_crypto_ccmp.c#11 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_dfs.c#5 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ht.c#12 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_ioctl.c#48 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_node.c#50 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_node.h#31 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_proto.h#27 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_sta.c#11 integrate
.. //depot/projects/smpng/sys/netgraph/netgraph.h#38 integrate
.. //depot/projects/smpng/sys/netgraph/ng_base.c#66 integrate
.. //depot/projects/smpng/sys/netgraph/ng_eiface.c#34 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ether.c#42 integrate
.. //depot/projects/smpng/sys/netgraph/ng_iface.c#36 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ip_input.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ipfw.c#7 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ipfw.h#3 integrate
.. //depot/projects/smpng/sys/netinet/igmp.h#8 integrate
.. //depot/projects/smpng/sys/netinet/ip_dummynet.h#26 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw.h#50 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/ip_dummynet.c#2 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/ip_fw2.c#2 integrate
.. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_pfil.c#2 integrate
.. //depot/projects/smpng/sys/netinet/tcp_debug.c#11 integrate
.. //depot/projects/smpng/sys/netinet/tcp_input.c#127 integrate
.. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#78 integrate
.. //depot/projects/smpng/sys/netinet/tcp_var.h#69 integrate
.. //depot/projects/smpng/sys/netinet6/in6.c#57 integrate
.. //depot/projects/smpng/sys/netinet6/mld6.c#31 integrate
.. //depot/projects/smpng/sys/netipsec/ipsec.c#37 integrate
.. //depot/projects/smpng/sys/netipsec/ipsec_input.c#20 integrate
.. //depot/projects/smpng/sys/netipsec/xform_ipip.c#23 integrate
.. //depot/projects/smpng/sys/netipx/spx_debug.c#7 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#59 integrate
.. //depot/projects/smpng/sys/powerpc/aim/machdep.c#15 integrate
.. //depot/projects/smpng/sys/powerpc/aim/platform_chrp.c#2 integrate
.. //depot/projects/smpng/sys/powerpc/ofw/ofw_real.c#2 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/cuda.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/powermac/pmu.c#4 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#16 integrate
.. //depot/projects/smpng/sys/powerpc/psim/ata_iobus.c#13 integrate
.. //depot/projects/smpng/sys/rpc/clnt_rc.c#6 integrate
.. //depot/projects/smpng/sys/security/audit/audit_pipe.c#17 integrate
.. //depot/projects/smpng/sys/sys/bio.h#29 integrate
.. //depot/projects/smpng/sys/sys/buf_ring.h#4 integrate
.. //depot/projects/smpng/sys/sys/bus.h#34 integrate
.. //depot/projects/smpng/sys/sys/event.h#25 integrate
.. //depot/projects/smpng/sys/sys/kobj.h#9 integrate
.. //depot/projects/smpng/sys/sys/proc.h#199 integrate
.. //depot/projects/smpng/sys/sys/soundcard.h#16 integrate
.. //depot/projects/smpng/sys/sys/vimage.h#14 integrate
.. //depot/projects/smpng/sys/tools/emu10k1-mkalsa.sh#2 delete
.. //depot/projects/smpng/sys/tools/feeder_eq_mkfilter.awk#2 delete
.. //depot/projects/smpng/sys/tools/feeder_rate_mkfilter.awk#2 delete
.. //depot/projects/smpng/sys/tools/snd_fxdiv_gen.awk#2 delete
.. //depot/projects/smpng/sys/tools/sound/emu10k1-mkalsa.sh#1 branch
.. //depot/projects/smpng/sys/tools/sound/feeder_eq_mkfilter.awk#1 branch
.. //depot/projects/smpng/sys/tools/sound/feeder_rate_mkfilter.awk#1 branch
.. //depot/projects/smpng/sys/tools/sound/snd_fxdiv_gen.awk#1 branch
.. //depot/projects/smpng/sys/vm/vm_contig.c#48 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#98 integrate

Differences ...

==== //depot/projects/smpng/share/man/man9/Makefile#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.354 2009/06/09 14:26:23 jhb Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.355 2009/06/09 23:38:19 imp Exp $
 
 MAN=	accept_filter.9 \
 	accf_data.9 \
@@ -57,7 +57,6 @@
 	DECLARE_MODULE.9 \
 	DELAY.9 \
 	devclass.9 \
-	devclass_add_driver.9 \
 	devclass_find.9 \
 	devclass_get_device.9 \
 	devclass_get_devices.9 \
@@ -555,8 +554,6 @@
 	crypto.9 crypto_unregister_all.9
 MLINKS+=DB_COMMAND.9 DB_SHOW_COMMAND.9 \
 	DB_COMMAND.9 DB_SHOW_ALL_COMMAND.9
-MLINKS+=devclass_add_driver.9 devclass_delete_driver.9 \
-	devclass_add_driver.9 devclass_find_driver.9
 MLINKS+=dev_clone.9 drain_dev_clone_events.9
 MLINKS+=devfs_set_cdevpriv.9 devfs_get_cdevpriv.9 \
 	devfs_set_cdevpriv.9 devfs_clear_cdevpriv.9

==== //depot/projects/smpng/sys/amd64/conf/DEFAULTS#14 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64
 #
-# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.18 2009/05/10 00:00:25 kuriyama Exp $
+# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.19 2009/06/09 20:26:52 kmacy Exp $
 
 machine		amd64
 
@@ -21,4 +21,3 @@
 options 	GEOM_PART_EBR_COMPAT
 options 	GEOM_PART_MBR
 
-options 	FLOWTABLE

==== //depot/projects/smpng/sys/amd64/conf/GENERIC#79 (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.526 2009/06/02 18:31:08 rwatson Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.528 2009/06/10 02:07:58 yongari Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -71,6 +71,7 @@
 options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
 options 	AUDIT			# Security event auditing
 options 	MAC			# TrustedBSD MAC Framework
+options		FLOWTABLE		# per-cpu routing cache
 #options 	KDTRACE_FRAME		# Ensure frames are compiled in
 #options 	KDTRACE_HOOKS		# Kernel DTrace hooks
 
@@ -212,6 +213,7 @@
 device		miibus		# MII bus support
 device		ae		# Attansic/Atheros L2 FastEthernet
 device		age		# Attansic/Atheros L1 Gigabit Ethernet
+device		alc		# Atheros AR8131/AR8132 Ethernet
 device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
 device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
 device		bfe		# Broadcom BCM440x 10/100 Ethernet

==== //depot/projects/smpng/sys/arm/arm/intr.c#22 (text+ko) ====

@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.24 2008/09/11 12:36:13 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.25 2009/06/09 18:18:41 marcel Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/syslog.h> 
@@ -120,7 +120,8 @@
 	int i;
 
 	PCPU_INC(cnt.v_intr);
-	while ((i = arm_get_next_irq()) != -1) {
+	i = -1;
+	while ((i = arm_get_next_irq(i)) != -1) {
 		intrcnt[intrcnt_tab[i]]++;
 		event = intr_events[i];
 		if (intr_event_handle(event, frame) != 0) {

==== //depot/projects/smpng/sys/arm/arm/locore.S#20 (text+ko) ====

@@ -37,7 +37,7 @@
 #include <machine/asm.h>
 #include <machine/armreg.h>
 #include <machine/pte.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.22 2009/03/31 23:06:20 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.23 2009/06/09 17:21:47 marcel Exp $");
 
 /* What size should this really be ? It is only used by initarm() */
 #define INIT_ARM_STACK_SIZE	2048
@@ -73,6 +73,11 @@
 
 	mov	ip, r0
 
+	/* Make sure interrupts are disabled. */
+	mrs	r7, cpsr
+	orr	r7, r7, #(I32_bit|F32_bit)
+	msr	cpsr_c, r7
+
 #if defined (FLASHADDR) && defined(LOADERRAMADDR)
 	/* Check if we're running from flash. */
 	ldr	r7, =FLASHADDR

==== //depot/projects/smpng/sys/arm/at91/at91.c#20 (text) ====

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.24 2009/05/15 04:49:20 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.25 2009/06/09 18:18:41 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -702,9 +702,8 @@
 }
 
 int
-arm_get_next_irq()
+arm_get_next_irq(int last __unused)
 {
-
 	int status;
 	int irq;
 	

==== //depot/projects/smpng/sys/arm/at91/at91_cfata.c#3 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_cfata.c,v 1.3 2009/05/10 11:05:22 stas Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_cfata.c,v 1.4 2009/06/10 17:39:19 imp Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -94,7 +94,7 @@
 	/* XXX: init CF controller? */
 
 	callout_init(&sc->tick, 1);	/* Callout to poll the device. */
-	device_add_child(dev, "ata", devclass_find_free_unit(ata_devclass, 0));
+	device_add_child(dev, "ata", -1);
 	bus_generic_attach(dev);
 	return (0);
 }

==== //depot/projects/smpng/sys/arm/at91/at91_mci.c#13 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.16 2009/01/23 00:51:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.17 2009/06/11 17:05:13 avg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -612,7 +612,7 @@
 }
 
 static int
-at91_mci_read_ivar(device_t bus, device_t child, int which, u_char *result)
+at91_mci_read_ivar(device_t bus, device_t child, int which, uintptr_t *result)
 {
 	struct at91_mci_softc *sc = device_get_softc(bus);
 

==== //depot/projects/smpng/sys/arm/at91/at91_twi.c#14 (text) ====

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.14 2009/01/22 21:55:37 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.15 2009/06/11 17:05:13 avg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -289,7 +289,7 @@
 }
 
 static int
-at91_twi_callback(device_t dev, int index, caddr_t *data)
+at91_twi_callback(device_t dev, int index, caddr_t data)
 {
 	int error = 0;
 

==== //depot/projects/smpng/sys/arm/at91/if_ate.c#22 (text) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.37 2009/05/13 21:01:10 stas Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.38 2009/06/11 17:05:13 avg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1190,7 +1190,7 @@
 	return (val);
 }
 
-static void
+static int
 ate_miibus_writereg(device_t dev, int phy, int reg, int data)
 {
 	struct ate_softc *sc;
@@ -1204,7 +1204,7 @@
 	WR4(sc, ETH_MAN, ETH_MAN_REG_WR(phy, reg, data));
 	while ((RD4(sc, ETH_SR) & ETH_SR_IDLE) == 0)
 		continue;
-	return;
+	return (0);
 }
 
 static device_method_t ate_methods[] = {

==== //depot/projects/smpng/sys/arm/include/intr.h#12 (text+ko) ====

@@ -32,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/arm/include/intr.h,v 1.12 2008/12/20 03:26:09 sam Exp $
+ * $FreeBSD: src/sys/arm/include/intr.h,v 1.13 2009/06/09 18:18:41 marcel Exp $
  *
  */
 
@@ -56,7 +56,7 @@
 
 #include <machine/psl.h>
 
-int arm_get_next_irq(void);
+int arm_get_next_irq(int);
 void arm_mask_irq(uintptr_t);
 void arm_unmask_irq(uintptr_t);
 void arm_setup_irqhandler(const char *, int (*)(void*), void (*)(void*), 

==== //depot/projects/smpng/sys/arm/mv/ic.c#3 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/ic.c,v 1.2 2009/04/16 11:20:18 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/ic.c,v 1.3 2009/06/09 18:18:41 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -137,7 +137,7 @@
 DRIVER_MODULE(ic, mbus, mv_ic_driver, mv_ic_devclass, 0, 0);
 
 int
-arm_get_next_irq(void)
+arm_get_next_irq(int last __unused)
 {
 	int irq;
 

==== //depot/projects/smpng/sys/arm/mv/twsi.c#2 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/mv/twsi.c,v 1.1 2008/10/13 20:07:13 raj Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/mv/twsi.c,v 1.2 2009/06/11 17:05:13 avg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -117,7 +117,7 @@
 static int mv_twsi_stop(device_t dev);
 static int mv_twsi_read(device_t dev, char *buf, int len, int *read, int last,
     int delay);
-static int mv_twsi_write(device_t dev, char *buf, int len, int *sent,
+static int mv_twsi_write(device_t dev, const char *buf, int len, int *sent,
     int timeout);
 
 static struct resource_spec res_spec[] = {
@@ -488,7 +488,7 @@
 }
 
 static int
-mv_twsi_write(device_t dev, char *buf, int len, int *sent, int timeout)
+mv_twsi_write(device_t dev, const char *buf, int len, int *sent, int timeout)
 {
 	struct mv_twsi_softc *sc;
 	uint32_t status;

==== //depot/projects/smpng/sys/arm/sa11x0/sa11x0_irqhandler.c#7 (text+ko) ====

@@ -76,7 +76,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irqhandler.c,v 1.6 2006/10/21 04:25:00 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_irqhandler.c,v 1.7 2009/06/09 18:18:41 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/kernel.h>
@@ -108,7 +108,7 @@
 extern vm_offset_t saipic_base;
 
 int
-arm_get_next_irq()
+arm_get_next_irq(int last __unused)
 {
 	int irq;
 

==== //depot/projects/smpng/sys/arm/xscale/i80321/i80321.c#8 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321.c,v 1.7 2007/09/04 18:45:27 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321.c,v 1.8 2009/06/09 18:18:41 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -240,7 +240,7 @@
 }
 
 int
-arm_get_next_irq()
+arm_get_next_irq(int last __unused)
 {
 	int irq;
 

==== //depot/projects/smpng/sys/arm/xscale/i80321/i80321_pci.c#12 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.12 2007/09/30 11:05:13 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.13 2009/06/11 17:05:13 avg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -174,8 +174,8 @@
 }
 
 static u_int32_t
-i80321_pci_read_config(device_t dev, int bus, int slot, int func, int reg,
-    int bytes)
+i80321_pci_read_config(device_t dev, u_int bus, u_int slot, u_int func,
+    u_int reg, int bytes)
 {
 	struct i80321_pci_softc *sc = device_get_softc(dev);
 	uint32_t isr;
@@ -215,8 +215,8 @@
 }
 
 static void
-i80321_pci_write_config(device_t dev, int bus, int slot, int func, int reg,
-    u_int32_t data, int bytes)
+i80321_pci_write_config(device_t dev, u_int bus, u_int slot, u_int func,
+    u_int reg, u_int32_t data, int bytes)
 {
 	struct i80321_pci_softc *sc = device_get_softc(dev);
 	uint32_t addr;

==== //depot/projects/smpng/sys/arm/xscale/i8134x/i81342.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342.c,v 1.2 2007/09/22 16:25:43 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342.c,v 1.3 2009/06/09 18:18:41 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -295,7 +295,7 @@
 }
 
 int
-arm_get_next_irq(void)
+arm_get_next_irq(int last __unused)
 {
 	uint32_t val;
 	val = intpnd0_read() & intr_enabled0;

==== //depot/projects/smpng/sys/arm/xscale/ixp425/avila_ata.c#6 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.6 2008/12/20 03:26:09 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_ata.c,v 1.7 2009/06/12 00:07:09 imp Exp $");
 
 /*
  * Compact Flash Support for the Avila Gateworks XScale boards.
@@ -248,7 +248,7 @@
 	    NULL, ata_avila_intr, sc, &sc->sc_ih);
 
 	/* attach channel on this controller */
-	device_add_child(dev, "ata", devclass_find_free_unit(ata_devclass, 0));
+	device_add_child(dev, "ata", -1);
 	bus_generic_attach(dev);
 
 	return 0;

==== //depot/projects/smpng/sys/arm/xscale/ixp425/avila_led.c#3 (text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_led.c,v 1.2 2008/12/20 03:26:09 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/avila_led.c,v 1.3 2009/06/11 17:05:13 avg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -88,13 +88,14 @@
 	return (0);
 }
 
-static void
+static int
 led_avila_detach(device_t dev)
 {
 	struct led_avila_softc *sc = device_get_softc(dev);
 
 	if (sc->sc_led != NULL)
 		led_destroy(sc->sc_led);
+	return (0);
 }
 
 static device_method_t led_avila_methods[] = {

==== //depot/projects/smpng/sys/arm/xscale/ixp425/cambria_led.c#2 (text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/cambria_led.c,v 1.1 2008/12/20 03:26:09 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/cambria_led.c,v 1.2 2009/06/11 17:05:13 avg Exp $");
 
 /*
  * Gateworks Cambria Octal LED Latch driver.
@@ -102,7 +102,7 @@
 	return 0;
 }
 
-static void
+static int
 led_detach(device_t dev)
 {
 	struct led_softc *sc = device_get_softc(dev);
@@ -113,12 +113,13 @@
 		if (led != NULL)
 			led_destroy(led);
 	}
+	return (0);
 }
 
 static device_method_t led_methods[] = {
 	DEVMETHOD(device_probe,		led_probe),
 	DEVMETHOD(device_attach,	led_attach),
-	DEVMETHOD(device_attach,	led_detach),
+	DEVMETHOD(device_detach,	led_detach),
 
 	{0, 0},
 };

==== //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#13 (text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.17 2009/05/30 18:23:55 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.18 2009/06/11 17:05:13 avg Exp $");
 
 /*
  * Intel XScale NPE Ethernet driver.
@@ -1691,20 +1691,21 @@
 	return (v & NPE_MII_READ_FAIL) ? 0xffff : (v & 0xffff);
 }
 
-static void
+static int
 npe_miibus_writereg(device_t dev, int phy, int reg, int data)
 {
 	struct npe_softc *sc = device_get_softc(dev);
 	uint32_t v;
 
 	if (phy != sc->sc_phy)		/* XXX */
-		return;
+		return (0);
 	v = (phy << NPE_MII_ADDR_SHL) | (reg << NPE_MII_REG_SHL)
 	  | data | NPE_MII_WRITE
 	  | NPE_MII_GO;
 	npe_mii_mdio_write(sc, NPE_MAC_MDIO_CMD, v);
 	/* XXX complain about timeout */
 	(void) npe_mii_mdio_wait(sc);
+	return (0);
 }
 
 static void

==== //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425.c#11 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.17 2009/03/10 19:15:35 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425.c,v 1.19 2009/06/11 17:05:13 avg Exp $");
 
 #include "opt_ddb.h"
 
@@ -202,7 +202,7 @@
 }
 
 int
-arm_get_next_irq(void)
+arm_get_next_irq(int last __unused)
 {
 	uint32_t irq;
 
@@ -334,7 +334,7 @@
 }
 
 static int
-ixp425_read_ivar(device_t bus, device_t child, int which, u_char *result)
+ixp425_read_ivar(device_t bus, device_t child, int which, uintptr_t *result)
 {
 	struct ixp425_ivar *ivar = IXP425_IVAR(child);
 

==== //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_iic.c#5 (text+ko) ====

@@ -24,7 +24,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_iic.c,v 1.4 2008/12/20 03:26:09 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_iic.c,v 1.5 2009/06/11 17:05:13 avg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -95,7 +95,7 @@
 }
 
 static int
-ixpiic_callback(device_t dev, int index, caddr_t *data)
+ixpiic_callback(device_t dev, int index, caddr_t data)
 {
 	return (0);
 }
@@ -129,7 +129,7 @@
 }
 
 static void 
-ixpiic_setsda(device_t dev, char val)
+ixpiic_setsda(device_t dev, int val)
 {
 	struct ixpiic_softc *sc = ixpiic_sc;
 
@@ -144,7 +144,7 @@
 }
 
 static void 
-ixpiic_setscl(device_t dev, char val)
+ixpiic_setscl(device_t dev, int val)
 {
 	struct ixpiic_softc *sc = ixpiic_sc;
 

==== //depot/projects/smpng/sys/arm/xscale/pxa/pxa_icu.c#2 (text+ko) ====

@@ -23,7 +23,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/pxa/pxa_icu.c,v 1.1 2008/06/06 05:08:09 benno Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/pxa/pxa_icu.c,v 1.2 2009/06/09 18:18:41 marcel Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -128,7 +128,7 @@
 DRIVER_MODULE(pxaicu, pxa, pxa_icu_driver, pxa_icu_devclass, 0, 0);
 
 int
-arm_get_next_irq()
+arm_get_next_irq(int last __unused)
 {
 	int	irq;
 

==== //depot/projects/smpng/sys/boot/forth/loader.conf#62 (text+ko) ====

@@ -6,7 +6,7 @@
 #
 # All arguments must be in double quotes.
 #
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.140 2009/05/17 10:58:50 brueffer Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.141 2009/06/10 02:07:58 yongari Exp $
 
 ##############################################################
 ###  Basic configuration options  ############################
@@ -210,6 +210,7 @@
 miibus_load="NO"		# miibus support, needed for some drivers
 if_ae_load="NO"			# Attansic/Atheros L2 FastEthernet
 if_age_load="NO"		# Attansic/Atheros L1 Gigabit Ethernet
+if_alc_load="NO"		# Atheros AR8131/AR8132 Ethernet
 if_ale_load="NO"		# Atheros AR8121/AR8113/AR8114 Ethernet
 if_an_load="NO"			# Aironet 4500/4800 802.11 wireless NICs
 if_ar_load="NO"			# Digi SYNC/570i

==== //depot/projects/smpng/sys/cam/scsi/scsi_target.c#27 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.76 2008/10/23 15:53:51 des Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.77 2009/06/10 20:59:32 kib Exp $");
 
 
 #include <sys/param.h>
@@ -194,7 +194,7 @@
 	TAILQ_INIT(&softc->work_queue);
 	TAILQ_INIT(&softc->abort_queue);
 	TAILQ_INIT(&softc->user_ccb_queue);
-	knlist_init(&softc->read_select.si_note, NULL, NULL, NULL, NULL);
+	knlist_init_mtx(&softc->read_select.si_note, NULL);
 
 	return (0);
 }

==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 (text+ko) ====

@@ -158,6 +158,7 @@
  */
 static int		arc_min_prefetch_lifespan;
 
+extern int zfs_prefetch_enable;
 static int arc_dead;
 
 /*
@@ -3421,6 +3422,8 @@
 void
 arc_init(void)
 {
+	int prefetch_tunable_set = 0;
+	
 	mutex_init(&arc_reclaim_thr_lock, NULL, MUTEX_DEFAULT, NULL);
 	cv_init(&arc_reclaim_thr_cv, NULL, CV_DEFAULT, NULL);
 	mutex_init(&arc_lowmem_lock, NULL, MUTEX_DEFAULT, NULL);
@@ -3549,6 +3552,23 @@
 	mutex_init(&zfs_write_limit_lock, NULL, MUTEX_DEFAULT, NULL);
 
 #ifdef _KERNEL
+	if (TUNABLE_INT_FETCH("vfs.zfs.prefetch_enable", &zfs_prefetch_enable))
+		prefetch_tunable_set = 1;
+	
+#ifdef __i386__
+	if (prefetch_tunable_set == 0) {
+		printf("ZFS NOTICE: prefetch is disabled by default on i386"
+		    " - add enable to tunable to change.\n" );
+		zfs_prefetch_enable=0;
+	}
+#else	
+	if ((((uint64_t)physmem * PAGESIZE) < (1ULL << 32)) &&
+	    prefetch_tunable_set == 0) {
+		printf("ZFS NOTICE: system has less than 4GB and prefetch enable is not set"
+		    "... disabling.\n");
+		zfs_prefetch_enable=0;
+	}
+#endif	
 	/* Warn about ZFS memory and address space requirements. */
 	if (((uint64_t)physmem * PAGESIZE) < (256 + 128 + 64) * (1 << 20)) {
 		printf("ZFS WARNING: Recommended minimum RAM size is 512MB; "

==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#4 (text+ko) ====

@@ -326,7 +326,7 @@
 	uint64_t blkid;
 	int nblks, i, err;
 
-	if (zfs_prefetch_disable)
+	if (zfs_prefetch_enable == 0)
 		return;
 
 	if (len == 0) {  /* they're interested in the bonus buffer */

==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#4 (text+ko) ====

@@ -37,7 +37,7 @@
  * until we can get this working the way we want it to.
  */
 
-int zfs_prefetch_disable = 0;
+int zfs_prefetch_enable = 1;
 
 /* max # of streams per zfetch */
 uint32_t	zfetch_max_streams = 8;
@@ -49,9 +49,8 @@
 uint64_t	zfetch_array_rd_sz = 1024 * 1024;
 
 SYSCTL_DECL(_vfs_zfs);
-TUNABLE_INT("vfs.zfs.prefetch_disable", &zfs_prefetch_disable);
-SYSCTL_INT(_vfs_zfs, OID_AUTO, prefetch_disable, CTLFLAG_RDTUN,
-    &zfs_prefetch_disable, 0, "Disable prefetch");
+SYSCTL_INT(_vfs_zfs, OID_AUTO, prefetch_enable, CTLFLAG_RDTUN,
+    &zfs_prefetch_enable, 0, "Enable prefetch for systems with less than 4GB");
 SYSCTL_NODE(_vfs_zfs, OID_AUTO, zfetch, CTLFLAG_RW, 0, "ZFS ZFETCH");
 TUNABLE_INT("vfs.zfs.zfetch.max_streams", &zfetch_max_streams);
 SYSCTL_UINT(_vfs_zfs_zfetch, OID_AUTO, max_streams, CTLFLAG_RDTUN,
@@ -599,7 +598,7 @@
 	unsigned int	blkshft;
 	uint64_t	blksz;
 
-	if (zfs_prefetch_disable)
+	if (zfs_prefetch_enable == 0)
 		return;
 
 	/* files that aren't ln2 blocksz are only one block -- nothing to do */

==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 (text+ko) ====

@@ -457,7 +457,7 @@
 int dmu_write_pages(objset_t *os, uint64_t object, uint64_t offset,
     uint64_t size, struct page *pp, dmu_tx_t *tx);
 
-extern int zfs_prefetch_disable;
+extern int zfs_prefetch_enable;
 
 /*
  * Asynchronously try to read in the data.

==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_proto.h#53 (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.100 2009/04/29 21:50:13 jamie Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 191673 2009-04-29 21:14:15Z jamie 
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.101 2009/06/10 13:48:43 kib Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 193916 2009-06-10 13:48:13Z kib 
  */
 
 #ifndef _FREEBSD32_SYSPROTO_H_

==== //depot/projects/smpng/sys/compat/freebsd32/freebsd32_syscall.h#53 (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.99 2009/04/29 21:50:13 jamie Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 191673 2009-04-29 21:14:15Z jamie 
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.100 2009/06/10 13:48:43 kib Exp $
+ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 193916 2009-06-10 13:48:13Z kib 
  */
 
 #define	FREEBSD32_SYS_syscall	0
@@ -303,6 +303,9 @@
 #define	FREEBSD32_SYS_statfs	396
 #define	FREEBSD32_SYS_fstatfs	397
 #define	FREEBSD32_SYS_fhstatfs	398
+#define	FREEBSD32_SYS_extattr_set_link	412
+#define	FREEBSD32_SYS_extattr_get_link	413
+#define	FREEBSD32_SYS_extattr_delete_link	414

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