PERFORCE change 164122 for review
Marko Zec
zec at FreeBSD.org
Thu Jun 11 17:05:25 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=164122
Change 164122 by zec at zec_amdx4 on 2009/06/11 17:05:14
IFC @ 164119
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/amd64/conf/DEFAULTS#6 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#16 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/intr.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/locore.S#4 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/at91.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_cfata.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/include/intr.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/mv/ic.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/xscale/i80321/i80321.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/xscale/i8134x/i81342.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/xscale/pxa/pxa_icu.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/forth/loader.conf#13 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_target.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_proto.h#14 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscall.h#14 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscalls.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/syscalls.master#14 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/NOTES#29 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/files#42 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/options#32 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/if_pflog.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/acpica/Osd/OsdSchedule.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpivar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/alc/if_alc.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/alc/if_alcreg.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/alc/if_alcvar.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-acerlabs.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cfi/cfi_core.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_multiq.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_sge.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_igb.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxp.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/nmdm/nmdm.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/midi/midi.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/midi/mpu401.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/channel.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/mixer.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/sound.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken_demo.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken_stress.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_vnops.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vnops.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/fifofs/fifo_vnops.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_vnops.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clbio.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clvnops.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/pseudofs/pseudofs_vnops.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/geom.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/geom_io.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/acpica/acpi_machdep.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/conf/DEFAULTS#7 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/conf/GENERIC#16 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/bus_if.m#3 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/init_main.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_event.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_fork.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#25 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_lockf.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_acl_nfs4.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/kern/subr_bus.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sys_pipe.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sysv_shm.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/tty.c#25 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/tty_pts.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_mqueue.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#23 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_syscalls.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_aio.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/libkern/jenkins.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/Makefile#25 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/alc/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/sound/sound/Makefile#5 integrate
.. //depot/projects/vimage-commit2/src/sys/net/bpf.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/net/flowtable.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/net/flowtable.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if.c#76 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_arcsubr.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#30 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_fddisubr.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_fwsubr.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#31 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_iso88025subr.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_tap.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_tun.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_var.h#31 integrate
.. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#30 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#19 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.h#11 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_crypto_ccmp.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_dfs.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ht.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.h#12 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_proto.h#10 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_sta.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ipfw.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ipfw.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/igmp.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_dummynet.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#27 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_dummynet.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_fw2.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_fw_pfil.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_debug.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#38 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#19 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#17 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#35 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_input.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#19 integrate
.. //depot/projects/vimage-commit2/src/sys/netipx/spx_debug.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_bio.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/aim/machdep.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/aim/platform_chrp.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/openpic.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/psim/ata_iobus.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/clnt_rc.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/security/audit/audit_pipe.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/bio.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/buf_ring.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/bus.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/event.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/soundcard.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#72 integrate
.. //depot/projects/vimage-commit2/src/sys/tools/emu10k1-mkalsa.sh#2 delete
.. //depot/projects/vimage-commit2/src/sys/tools/feeder_eq_mkfilter.awk#2 delete
.. //depot/projects/vimage-commit2/src/sys/tools/feeder_rate_mkfilter.awk#2 delete
.. //depot/projects/vimage-commit2/src/sys/tools/snd_fxdiv_gen.awk#2 delete
.. //depot/projects/vimage-commit2/src/sys/tools/sound/emu10k1-mkalsa.sh#1 branch
.. //depot/projects/vimage-commit2/src/sys/tools/sound/feeder_eq_mkfilter.awk#1 branch
.. //depot/projects/vimage-commit2/src/sys/tools/sound/feeder_rate_mkfilter.awk#1 branch
.. //depot/projects/vimage-commit2/src/sys/tools/sound/snd_fxdiv_gen.awk#1 branch
.. //depot/projects/vimage-commit2/src/sys/vm/vm_map.c#8 integrate
Differences ...
==== //depot/projects/vimage-commit2/src/sys/amd64/conf/DEFAULTS#6 (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/vimage-commit2/src/sys/amd64/conf/GENERIC#16 (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/vimage-commit2/src/sys/arm/arm/intr.c#4 (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/vimage-commit2/src/sys/arm/arm/locore.S#4 (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/vimage-commit2/src/sys/arm/at91/at91.c#9 (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/vimage-commit2/src/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/vimage-commit2/src/sys/arm/include/intr.h#5 (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/vimage-commit2/src/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/vimage-commit2/src/sys/arm/sa11x0/sa11x0_irqhandler.c#2 (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/vimage-commit2/src/sys/arm/xscale/i80321/i80321.c#2 (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/vimage-commit2/src/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/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425.c#5 (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.18 2009/06/09 18:18:41 marcel 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;
==== //depot/projects/vimage-commit2/src/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/vimage-commit2/src/sys/boot/forth/loader.conf#13 (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/vimage-commit2/src/sys/cam/scsi/scsi_target.c#4 (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/vimage-commit2/src/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/vimage-commit2/src/sys/compat/freebsd32/freebsd32_proto.h#14 (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/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscall.h#14 (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
#define FREEBSD32_SYS_freebsd32_sigaction 416
#define FREEBSD32_SYS_freebsd32_sigreturn 417
#define FREEBSD32_SYS_freebsd32_getcontext 421
@@ -315,6 +318,9 @@
#define FREEBSD32_SYS_freebsd32_umtx_lock 434
#define FREEBSD32_SYS_freebsd32_umtx_unlock 435
#define FREEBSD32_SYS_jail_attach 436
+#define FREEBSD32_SYS_extattr_list_fd 437
+#define FREEBSD32_SYS_extattr_list_file 438
+#define FREEBSD32_SYS_extattr_list_link 439
#define FREEBSD32_SYS_freebsd32_thr_suspend 442
#define FREEBSD32_SYS_thr_wake 443
#define FREEBSD32_SYS_kldunloadf 444
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscalls.c#14 (text+ko) ====
@@ -2,8 +2,8 @@
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.90 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_syscalls.c,v 1.91 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
*/
const char *freebsd32_syscallnames[] = {
@@ -419,9 +419,9 @@
"#409", /* 409 = __mac_get_pid */
"#410", /* 410 = __mac_get_link */
"#411", /* 411 = __mac_set_link */
- "#412", /* 412 = extattr_set_link */
- "#413", /* 413 = extattr_get_link */
- "#414", /* 414 = extattr_delete_link */
+ "extattr_set_link", /* 412 = extattr_set_link */
+ "extattr_get_link", /* 413 = extattr_get_link */
+ "extattr_delete_link", /* 414 = extattr_delete_link */
"#415", /* 415 = __mac_execve */
"freebsd32_sigaction", /* 416 = freebsd32_sigaction */
"freebsd32_sigreturn", /* 417 = freebsd32_sigreturn */
@@ -444,9 +444,9 @@
"freebsd32_umtx_lock", /* 434 = freebsd32_umtx_lock */
"freebsd32_umtx_unlock", /* 435 = freebsd32_umtx_unlock */
"jail_attach", /* 436 = jail_attach */
- "#437", /* 437 = extattr_list_fd */
- "#438", /* 438 = extattr_list_file */
- "#439", /* 439 = extattr_list_link */
+ "extattr_list_fd", /* 437 = extattr_list_fd */
+ "extattr_list_file", /* 438 = extattr_list_file */
+ "extattr_list_link", /* 439 = extattr_list_link */
"#440", /* 440 = kse_switchin */
"#441", /* 441 = ksem_timedwait */
"freebsd32_thr_suspend", /* 442 = freebsd32_thr_suspend */
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#15 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.101 2009/06/01 16:14:38 rwatson Exp $
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 191673 2009-04-29 21:14:15Z jamie
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.102 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
*/
#include "opt_compat.h"
@@ -450,9 +450,9 @@
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 409 = __mac_get_pid */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 410 = __mac_get_link */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 411 = __mac_set_link */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 412 = extattr_set_link */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 413 = extattr_get_link */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 414 = extattr_delete_link */
+ { AS(extattr_set_link_args), (sy_call_t *)extattr_set_link, AUE_EXTATTR_SET_LINK, NULL, 0, 0, 0 }, /* 412 = extattr_set_link */
+ { AS(extattr_get_link_args), (sy_call_t *)extattr_get_link, AUE_EXTATTR_GET_LINK, NULL, 0, 0, 0 }, /* 413 = extattr_get_link */
+ { AS(extattr_delete_link_args), (sy_call_t *)extattr_delete_link, AUE_EXTATTR_DELETE_LINK, NULL, 0, 0, 0 }, /* 414 = extattr_delete_link */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 415 = __mac_execve */
{ AS(freebsd32_sigaction_args), (sy_call_t *)freebsd32_sigaction, AUE_SIGACTION, NULL, 0, 0, 0 }, /* 416 = freebsd32_sigaction */
{ AS(freebsd32_sigreturn_args), (sy_call_t *)freebsd32_sigreturn, AUE_SIGRETURN, NULL, 0, 0, 0 }, /* 417 = freebsd32_sigreturn */
@@ -475,9 +475,9 @@
{ AS(freebsd32_umtx_lock_args), (sy_call_t *)freebsd32_umtx_lock, AUE_NULL, NULL, 0, 0, 0 }, /* 434 = freebsd32_umtx_lock */
{ AS(freebsd32_umtx_unlock_args), (sy_call_t *)freebsd32_umtx_unlock, AUE_NULL, NULL, 0, 0, 0 }, /* 435 = freebsd32_umtx_unlock */
{ AS(jail_attach_args), (sy_call_t *)jail_attach, AUE_NULL, NULL, 0, 0, 0 }, /* 436 = jail_attach */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 437 = extattr_list_fd */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 438 = extattr_list_file */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 439 = extattr_list_link */
+ { AS(extattr_list_fd_args), (sy_call_t *)extattr_list_fd, AUE_EXTATTR_LIST_FD, NULL, 0, 0, 0 }, /* 437 = extattr_list_fd */
+ { AS(extattr_list_file_args), (sy_call_t *)extattr_list_file, AUE_EXTATTR_LIST_FILE, NULL, 0, 0, 0 }, /* 438 = extattr_list_file */
+ { AS(extattr_list_link_args), (sy_call_t *)extattr_list_link, AUE_EXTATTR_LIST_LINK, NULL, 0, 0, 0 }, /* 439 = extattr_list_link */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 440 = kse_switchin */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0 }, /* 441 = ksem_timedwait */
{ AS(freebsd32_thr_suspend_args), (sy_call_t *)freebsd32_thr_suspend, AUE_NULL, NULL, 0, 0, 0 }, /* 442 = freebsd32_thr_suspend */
==== //depot/projects/vimage-commit2/src/sys/compat/freebsd32/syscalls.master#14 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.115 2009/04/29 21:14:15 jamie Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.116 2009/06/10 13:48:13 kib Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -708,9 +708,17 @@
409 AUE_NULL UNIMPL __mac_get_pid
410 AUE_NULL UNIMPL __mac_get_link
411 AUE_NULL UNIMPL __mac_set_link
-412 AUE_EXTATTR_SET_LINK UNIMPL extattr_set_link
-413 AUE_EXTATTR_GET_LINK UNIMPL extattr_get_link
-414 AUE_EXTATTR_DELETE_LINK UNIMPL extattr_delete_link
+412 AUE_EXTATTR_SET_LINK NOPROTO { int extattr_set_link( \
+ const char *path, int attrnamespace, \
+ const char *attrname, void *data, \
+ size_t nbytes); }
+413 AUE_EXTATTR_GET_LINK NOPROTO { ssize_t extattr_get_link( \
+ const char *path, int attrnamespace, \
+ const char *attrname, void *data, \
+ size_t nbytes); }
+414 AUE_EXTATTR_DELETE_LINK NOPROTO { int extattr_delete_link( \
+ const char *path, int attrnamespace, \
+ const char *attrname); }
415 AUE_NULL UNIMPL __mac_execve
416 AUE_SIGACTION STD { int freebsd32_sigaction(int sig, \
struct sigaction32 *act, \
@@ -741,9 +749,15 @@
434 AUE_NULL STD { int freebsd32_umtx_lock(struct umtx *umtx); }
435 AUE_NULL STD { int freebsd32_umtx_unlock(struct umtx *umtx); }
436 AUE_NULL NOPROTO { int jail_attach(int jid); }
-437 AUE_EXTATTR_LIST_FD UNIMPL extattr_list_fd
-438 AUE_EXTATTR_LIST_FILE UNIMPL extattr_list_file
-439 AUE_EXTATTR_LIST_LINK UNIMPL extattr_list_link
+437 AUE_EXTATTR_LIST_FD NOPROTO { ssize_t extattr_list_fd(int fd, \
+ int attrnamespace, void *data, \
+ size_t nbytes); }
+438 AUE_EXTATTR_LIST_FILE NOPROTO { ssize_t extattr_list_file( \
+ const char *path, int attrnamespace, \
+ void *data, size_t nbytes); }
+439 AUE_EXTATTR_LIST_LINK NOPROTO { ssize_t extattr_list_link( \
+ const char *path, int attrnamespace, \
+ void *data, size_t nbytes); }
440 AUE_NULL UNIMPL kse_switchin
441 AUE_NULL UNIMPL ksem_timedwait
442 AUE_NULL STD { int freebsd32_thr_suspend( \
==== //depot/projects/vimage-commit2/src/sys/conf/NOTES#29 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1544 2009/06/08 04:39:48 svn Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1545 2009/06/10 02:07:58 yongari Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1754,6 +1754,7 @@
# L2 PCI-Express FastEthernet controllers.
# age: Support for gigabit ethernet adapters based on the Attansic/Atheros
# L1 PCI express gigabit ethernet controllers.
+# alc: Support for Atheros AR8131/AR8132 PCIe ethernet controllers.
# ale: Support for Atheros AR8121/AR8113/AR8114 PCIe ethernet controllers.
# bce: Broadcom NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet
# adapters.
@@ -1896,6 +1897,7 @@
# PCI Ethernet NICs that use the common MII bus controller code.
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/vimage-commit2/src/sys/conf/files#42 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1415 2009/06/07 19:12:08 ariff Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1437 2009/06/11 12:56:14 bz Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -51,33 +51,33 @@
compile-with "${NORMAL_C}" \
no-implicit-rule local
emu10k1-alsa%diked.h optional snd_emu10k1 | snd_emu10kx \
- dependency "$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h" \
- compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \
+ dependency "$S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h" \
+ compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/emu10k1-alsa.h emu10k1-alsa%diked.h" \
no-obj no-implicit-rule before-depend \
clean "emu10k1-alsa%diked.h"
p16v-alsa%diked.h optional snd_emu10kx pci \
- dependency "$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h" \
- compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h p16v-alsa%diked.h" \
+ dependency "$S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h" \
+ compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p16v-alsa.h p16v-alsa%diked.h" \
no-obj no-implicit-rule before-depend \
clean "p16v-alsa%diked.h"
p17v-alsa%diked.h optional snd_emu10kx pci \
- dependency "$S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h" \
- compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h p17v-alsa%diked.h" \
+ dependency "$S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h" \
+ compile-with "CC='${CC}' AWK=${AWK} sh $S/tools/sound/emu10k1-mkalsa.sh $S/gnu/dev/sound/pci/p17v-alsa.h p17v-alsa%diked.h" \
no-obj no-implicit-rule before-depend \
clean "p17v-alsa%diked.h"
feeder_eq_gen.h optional sound \
- dependency "$S/tools/feeder_eq_mkfilter.awk" \
- compile-with "${AWK} -f $S/tools/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > feeder_eq_gen.h" \
+ dependency "$S/tools/sound/feeder_eq_mkfilter.awk" \
+ compile-with "${AWK} -f $S/tools/sound/feeder_eq_mkfilter.awk -- ${FEEDER_EQ_PRESETS} > feeder_eq_gen.h" \
no-obj no-implicit-rule before-depend \
clean "feeder_eq_gen.h"
feeder_rate_gen.h optional sound \
- dependency "$S/tools/feeder_rate_mkfilter.awk" \
- compile-with "${AWK} -f $S/tools/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > feeder_rate_gen.h" \
+ dependency "$S/tools/sound/feeder_rate_mkfilter.awk" \
+ compile-with "${AWK} -f $S/tools/sound/feeder_rate_mkfilter.awk -- ${FEEDER_RATE_PRESETS} > feeder_rate_gen.h" \
no-obj no-implicit-rule before-depend \
clean "feeder_rate_gen.h"
snd_fxdiv_gen.h optional sound \
- dependency "$S/tools/snd_fxdiv_gen.awk" \
- compile-with "${AWK} -f $S/tools/snd_fxdiv_gen.awk -- > snd_fxdiv_gen.h" \
+ dependency "$S/tools/sound/snd_fxdiv_gen.awk" \
+ compile-with "${AWK} -f $S/tools/sound/snd_fxdiv_gen.awk -- > snd_fxdiv_gen.h" \
no-obj no-implicit-rule before-depend \
clean "snd_fxdiv_gen.h"
miidevs.h optional miibus | mii \
@@ -335,25 +335,25 @@
compile-with "${NORMAL_C} -I$S/contrib/ngatm"
contrib/ngatm/netnatm/sig/sig_verify.c optional ngatm_uni \
compile-with "${NORMAL_C} -I$S/contrib/ngatm"
-contrib/pf/net/if_pflog.c optional pflog \
+contrib/pf/net/if_pflog.c optional pflog pf inet \
compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/if_pfsync.c optional pfsync \
+contrib/pf/net/if_pfsync.c optional pfsync pf inet \
compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf.c optional pf \
+contrib/pf/net/pf.c optional pf inet \
compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf_if.c optional pf \
+contrib/pf/net/pf_if.c optional pf inet \
compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf_ioctl.c optional pf \
+contrib/pf/net/pf_ioctl.c optional pf inet \
compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf_norm.c optional pf \
+contrib/pf/net/pf_norm.c optional pf inet \
compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf_osfp.c optional pf \
+contrib/pf/net/pf_osfp.c optional pf inet \
compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf_ruleset.c optional pf \
+contrib/pf/net/pf_ruleset.c optional pf inet \
compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf_subr.c optional pf \
+contrib/pf/net/pf_subr.c optional pf inet \
compile-with "${NORMAL_C} -I$S/contrib/pf"
-contrib/pf/net/pf_table.c optional pf \
+contrib/pf/net/pf_table.c optional pf inet \
compile-with "${NORMAL_C} -I$S/contrib/pf"
contrib/pf/netinet/in4_cksum.c optional pf inet
crypto/blowfish/bf_ecb.c optional ipsec
@@ -450,7 +450,7 @@
dev/advansys/adwlib.c optional adw
dev/advansys/adwmcode.c optional adw
dev/ae/if_ae.c optional ae pci
-dev/age/if_age.c optional age pci
+dev/age/if_age.c optional age pci inet
dev/agp/agp.c optional agp pci
dev/agp/agp_if.m optional agp pci
dev/aha/aha.c optional aha
@@ -471,7 +471,8 @@
dev/aic7xxx/aic7xxx_93cx6.c optional ahc
dev/aic7xxx/aic7xxx_osm.c optional ahc
dev/aic7xxx/aic7xxx_pci.c optional ahc pci
-dev/ale/if_ale.c optional ale pci
+dev/alc/if_alc.c optional alc pci inet
+dev/ale/if_ale.c optional ale pci inet
dev/amd/amd.c optional amd
dev/amr/amr.c optional amr
dev/amr/amr_cam.c optional amrp amr
@@ -859,9 +860,9 @@
dev/ed/if_ed_pci.c optional ed pci
dev/eisa/eisa_if.m standard
dev/eisa/eisaconf.c optional eisa
-dev/e1000/if_em.c optional em \
+dev/e1000/if_em.c optional em inet \
compile-with "${NORMAL_C} -I$S/dev/e1000"
-dev/e1000/if_igb.c optional igb \
+dev/e1000/if_igb.c optional igb inet \
compile-with "${NORMAL_C} -I$S/dev/e1000"
dev/e1000/e1000_80003es2lan.c optional em | igb \
compile-with "${NORMAL_C} -I$S/dev/e1000"
@@ -920,7 +921,7 @@
dev/firewire/sbp.c optional sbp
dev/firewire/sbp_targ.c optional sbp_targ
dev/flash/at45d.c optional at45d
-dev/fxp/if_fxp.c optional fxp
+dev/fxp/if_fxp.c optional fxp inet
dev/gem/if_gem.c optional gem
dev/gem/if_gem_pci.c optional gem pci
dev/hatm/if_hatm.c optional hatm pci
@@ -1085,19 +1086,19 @@
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
-dev/ixgbe/ixgbe.c optional ixgbe \
+dev/ixgbe/ixgbe.c optional ixgbe inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_phy.c optional ixgbe \
+dev/ixgbe/ixgbe_phy.c optional ixgbe inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_api.c optional ixgbe \
+dev/ixgbe/ixgbe_api.c optional ixgbe inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_common.c optional ixgbe \
+dev/ixgbe/ixgbe_common.c optional ixgbe inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_82598.c optional ixgbe \
+dev/ixgbe/ixgbe_82598.c optional ixgbe inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/ixgbe/ixgbe_82599.c optional ixgbe \
+dev/ixgbe/ixgbe_82599.c optional ixgbe inet \
compile-with "${NORMAL_C} -I$S/dev/ixgbe"
-dev/jme/if_jme.c optional jme pci
+dev/jme/if_jme.c optional jme pci inet
dev/joy/joy.c optional joy
dev/joy/joy_isa.c optional joy isa
dev/joy/joy_pccard.c optional joy pccard
@@ -1179,7 +1180,7 @@
dev/mpt/mpt_pci.c optional mpt pci
dev/mpt/mpt_raid.c optional mpt
dev/mpt/mpt_user.c optional mpt
-dev/msk/if_msk.c optional msk
+dev/msk/if_msk.c optional msk inet
dev/mwl/if_mwl.c optional mwl
dev/mwl/if_mwl_pci.c optional mwl pci
dev/mwl/mwlhal.c optional mwl
@@ -1207,12 +1208,12 @@
compile-with "uudecode -o ${.TARGET} $S/contrib/dev/mwl/mwlboot.fw.uu" \
no-obj no-implicit-rule \
clean "mwlboot.fw"
-dev/mxge/if_mxge.c optional mxge pci
-dev/mxge/mxge_lro.c optional mxge pci
-dev/mxge/mxge_eth_z8e.c optional mxge pci
-dev/mxge/mxge_ethp_z8e.c optional mxge pci
-dev/mxge/mxge_rss_eth_z8e.c optional mxge pci
-dev/mxge/mxge_rss_ethp_z8e.c optional mxge pci
+dev/mxge/if_mxge.c optional mxge pci inet
+dev/mxge/mxge_lro.c optional mxge pci inet
+dev/mxge/mxge_eth_z8e.c optional mxge pci inet
+dev/mxge/mxge_ethp_z8e.c optional mxge pci inet
+dev/mxge/mxge_rss_eth_z8e.c optional mxge pci inet
+dev/mxge/mxge_rss_ethp_z8e.c optional mxge pci inet
dev/my/if_my.c optional my
dev/ncv/ncr53c500.c optional ncv
dev/ncv/ncr53c500_pccard.c optional ncv pccard
@@ -1385,7 +1386,7 @@
dev/si/si_isa.c optional si isa
dev/si/si_pci.c optional si pci
dev/sis/if_sis.c optional sis pci
-dev/sk/if_sk.c optional sk pci
+dev/sk/if_sk.c optional sk pci inet
dev/smbus/smb.c optional smb
dev/smbus/smbconf.c optional smbus
dev/smbus/smbus.c optional smbus
@@ -1534,7 +1535,7 @@
dev/twe/twe.c optional twe
dev/twe/twe_freebsd.c optional twe
dev/tx/if_tx.c optional tx
-dev/txp/if_txp.c optional txp
+dev/txp/if_txp.c optional txp inet
dev/uart/uart_bus_acpi.c optional uart acpi
#dev/uart/uart_bus_cbus.c optional uart cbus
dev/uart/uart_bus_ebus.c optional uart ebus
@@ -1745,13 +1746,13 @@
fs/nfsclient/nfs_clport.c optional nfscl
fs/nfsclient/nfs_clbio.c optional nfscl
fs/nfsclient/nfs_clnfsiod.c optional nfscl
-fs/nfsserver/nfs_nfsdsocket.c optional nfsd
-fs/nfsserver/nfs_nfsdsubs.c optional nfsd
-fs/nfsserver/nfs_nfsdstate.c optional nfsd
-fs/nfsserver/nfs_nfsdkrpc.c optional nfsd
-fs/nfsserver/nfs_nfsdserv.c optional nfsd
-fs/nfsserver/nfs_nfsdport.c optional nfsd
-fs/nfsserver/nfs_nfsdcache.c optional nfsd
+fs/nfsserver/nfs_nfsdsocket.c optional nfsd inet
+fs/nfsserver/nfs_nfsdsubs.c optional nfsd inet
+fs/nfsserver/nfs_nfsdstate.c optional nfsd inet
+fs/nfsserver/nfs_nfsdkrpc.c optional nfsd inet
+fs/nfsserver/nfs_nfsdserv.c optional nfsd inet
+fs/nfsserver/nfs_nfsdport.c optional nfsd inet
+fs/nfsserver/nfs_nfsdcache.c optional nfsd inet
fs/ntfs/ntfs_compr.c optional ntfs
fs/ntfs/ntfs_iconv.c optional ntfs_iconv
fs/ntfs/ntfs_ihash.c optional ntfs
@@ -2180,25 +2181,25 @@
net/bpf_filter.c optional bpf | netgraph_bpf
net/bpf_zerocopy.c optional bpf
net/bridgestp.c optional bridge | if_bridge
-net/flowtable.c optional flowtable
+net/flowtable.c optional flowtable inet
net/ieee8023ad_lacp.c optional lagg
net/if.c standard
net/if_arcsubr.c optional arcnet
net/if_atmsubr.c optional atm
-net/if_bridge.c optional bridge | if_bridge
+net/if_bridge.c optional bridge inet | if_bridge inet
net/if_clone.c standard
net/if_dead.c standard
net/if_disc.c optional disc
net/if_edsc.c optional edsc
net/if_ef.c optional ef
-net/if_enc.c optional enc
+net/if_enc.c optional enc ipsec inet | enc ipsec inet6
net/if_ethersubr.c optional ether \
compile-with "${NORMAL_C} -I$S/contrib/pf"
net/if_faith.c optional faith
net/if_fddisubr.c optional fddi
net/if_fwsubr.c optional fwip
net/if_gif.c optional gif
-net/if_gre.c optional gre
+net/if_gre.c optional gre inet
net/if_iso88025subr.c optional token
net/if_lagg.c optional lagg
net/if_loop.c optional loop
@@ -2207,7 +2208,7 @@
net/if_mib.c standard
net/if_spppfr.c optional sppp | netgraph_sppp
net/if_spppsubr.c optional sppp | netgraph_sppp
-net/if_stf.c optional stf
+net/if_stf.c optional stf inet inet6
net/if_tun.c optional tun
net/if_tap.c optional tap
net/if_vlan.c optional vlan
@@ -2322,13 +2323,13 @@
netgraph/ng_hole.c optional netgraph_hole
netgraph/ng_iface.c optional netgraph_iface
netgraph/ng_ip_input.c optional netgraph_ip_input
-netgraph/ng_ipfw.c optional netgraph_ipfw
+netgraph/ng_ipfw.c optional netgraph_ipfw inet ipfirewall
netgraph/ng_ksocket.c optional netgraph_ksocket
netgraph/ng_l2tp.c optional netgraph_l2tp
netgraph/ng_lmi.c optional netgraph_lmi
netgraph/ng_mppc.c optional netgraph_mppc_compression | \
netgraph_mppc_encryption
-netgraph/ng_nat.c optional netgraph_nat
+netgraph/ng_nat.c optional netgraph_nat inet libalias
netgraph/ng_one2many.c optional netgraph_one2many
netgraph/ng_parse.c optional netgraph
netgraph/ng_ppp.c optional netgraph_ppp
@@ -2344,14 +2345,14 @@
netgraph/ng_tee.c optional netgraph_tee
netgraph/ng_tty.c optional netgraph_tty
netgraph/ng_vjc.c optional netgraph_vjc
-netinet/accf_data.c optional accept_filter_data
-netinet/accf_dns.c optional accept_filter_dns
-netinet/accf_http.c optional accept_filter_http
+netinet/accf_data.c optional accept_filter_data inet
+netinet/accf_dns.c optional accept_filter_dns inet
+netinet/accf_http.c optional accept_filter_http inet
netinet/if_atm.c optional atm
-netinet/if_ether.c optional ether
+netinet/if_ether.c optional inet ether
netinet/igmp.c optional inet
netinet/in.c optional inet
-netinet/ip_carp.c optional carp
+netinet/ip_carp.c optional inet carp | inet6 carp
netinet/in_gif.c optional gif inet
netinet/ip_gre.c optional gre inet
netinet/ip_id.c optional inet
@@ -2360,18 +2361,18 @@
netinet/in_proto.c optional inet \
compile-with "${NORMAL_C} -I$S/contrib/pf"
netinet/in_rmx.c optional inet
-netinet/ip_divert.c optional ipdivert
-netinet/ipfw/ip_dummynet.c optional dummynet
+netinet/ip_divert.c optional inet ipdivert ipfirewall
+netinet/ipfw/ip_dummynet.c optional inet dummynet
netinet/ip_ecn.c optional inet | inet6
netinet/ip_encap.c optional inet | inet6
netinet/ip_fastfwd.c optional inet
-netinet/ipfw/ip_fw2.c optional ipfirewall \
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list