Date: Thu, 11 Jun 2009 17:27:56 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 164129 for review Message-ID: <200906111727.n5BHRu5X007713@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=164129 Change 164129 by zec@zec_amdx4 on 2009/06/11 17:27:31 IFC @ 164119 Affected files ... .. //depot/projects/vimage/src/share/man/man4/Makefile#11 integrate .. //depot/projects/vimage/src/share/man/man4/alc.4#1 branch .. //depot/projects/vimage/src/share/man/man4/altq.4#6 integrate .. //depot/projects/vimage/src/share/man/man4/iwn.4#3 integrate .. //depot/projects/vimage/src/share/man/man4/miibus.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/mwl.4#1 branch .. //depot/projects/vimage/src/share/man/man4/mwlfw.4#1 branch .. //depot/projects/vimage/src/share/man/man4/ng_ipfw.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/vlan.4#3 integrate .. //depot/projects/vimage/src/share/man/man9/BUS_NEW_PASS.9#1 branch .. //depot/projects/vimage/src/share/man/man9/Makefile#9 integrate .. //depot/projects/vimage/src/share/man/man9/bus_generic_new_pass.9#1 branch .. //depot/projects/vimage/src/share/man/man9/bus_set_pass.9#1 branch .. //depot/projects/vimage/src/share/man/man9/devclass_add_driver.9#2 delete .. //depot/projects/vimage/src/sys/amd64/conf/DEFAULTS#10 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#32 integrate .. //depot/projects/vimage/src/sys/arm/arm/intr.c#8 integrate .. //depot/projects/vimage/src/sys/arm/arm/locore.S#8 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91.c#12 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_cfata.c#3 integrate .. //depot/projects/vimage/src/sys/arm/include/intr.h#9 integrate .. //depot/projects/vimage/src/sys/arm/mv/ic.c#3 integrate .. //depot/projects/vimage/src/sys/arm/sa11x0/sa11x0_irqhandler.c#2 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i80321/i80321.c#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/i8134x/i81342.c#3 integrate .. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425.c#10 integrate .. //depot/projects/vimage/src/sys/arm/xscale/pxa/pxa_icu.c#2 integrate .. //depot/projects/vimage/src/sys/boot/forth/loader.conf#21 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_target.c#7 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#4 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_proto.h#21 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscall.h#21 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_syscalls.c#21 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/freebsd32_sysent.c#22 integrate .. //depot/projects/vimage/src/sys/compat/freebsd32/syscalls.master#22 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#55 integrate .. //depot/projects/vimage/src/sys/conf/files#72 integrate .. //depot/projects/vimage/src/sys/conf/options#53 integrate .. //depot/projects/vimage/src/sys/contrib/pf/net/if_pflog.c#6 integrate .. //depot/projects/vimage/src/sys/dev/acpica/Osd/OsdSchedule.c#6 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_pcib_acpi.c#8 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpivar.h#10 integrate .. //depot/projects/vimage/src/sys/dev/alc/if_alc.c#1 branch .. //depot/projects/vimage/src/sys/dev/alc/if_alcreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/alc/if_alcvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-acerlabs.c#4 integrate .. //depot/projects/vimage/src/sys/dev/cfi/cfi_core.c#5 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_multiq.c#8 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#24 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_igb.c#9 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#16 integrate .. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#28 integrate .. //depot/projects/vimage/src/sys/dev/nmdm/nmdm.c#7 integrate .. //depot/projects/vimage/src/sys/dev/sound/midi/midi.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/midi/mpu401.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/channel.h#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/mixer.h#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/sound.h#10 integrate .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken_demo.c#2 integrate .. //depot/projects/vimage/src/sys/dev/syscons/teken/teken_stress.c#2 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_vnops.c#7 integrate .. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#29 integrate .. //depot/projects/vimage/src/sys/fs/fifofs/fifo_vnops.c#13 integrate .. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vnops.c#17 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clbio.c#5 integrate .. //depot/projects/vimage/src/sys/fs/nfsclient/nfs_clvnops.c#4 integrate .. //depot/projects/vimage/src/sys/fs/pseudofs/pseudofs_vnops.c#13 integrate .. //depot/projects/vimage/src/sys/geom/geom.h#7 integrate .. //depot/projects/vimage/src/sys/geom/geom_io.c#7 integrate .. //depot/projects/vimage/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#9 integrate .. //depot/projects/vimage/src/sys/i386/acpica/acpi_machdep.c#10 integrate .. //depot/projects/vimage/src/sys/i386/conf/DEFAULTS#14 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#35 integrate .. //depot/projects/vimage/src/sys/kern/bus_if.m#5 integrate .. //depot/projects/vimage/src/sys/kern/init_main.c#29 integrate .. //depot/projects/vimage/src/sys/kern/kern_event.c#11 integrate .. //depot/projects/vimage/src/sys/kern/kern_fork.c#28 integrate .. //depot/projects/vimage/src/sys/kern/kern_jail.c#30 integrate .. //depot/projects/vimage/src/sys/kern/kern_lockf.c#10 integrate .. //depot/projects/vimage/src/sys/kern/subr_acl_nfs4.c#1 branch .. //depot/projects/vimage/src/sys/kern/subr_bus.c#19 integrate .. //depot/projects/vimage/src/sys/kern/sys_pipe.c#12 integrate .. //depot/projects/vimage/src/sys/kern/sysv_shm.c#9 integrate .. //depot/projects/vimage/src/sys/kern/tty.c#38 integrate .. //depot/projects/vimage/src/sys/kern/tty_pts.c#16 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mqueue.c#14 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#38 integrate .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#30 integrate .. //depot/projects/vimage/src/sys/kern/vfs_aio.c#11 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#31 integrate .. //depot/projects/vimage/src/sys/libkern/jenkins.h#1 branch .. //depot/projects/vimage/src/sys/modules/Makefile#50 integrate .. //depot/projects/vimage/src/sys/modules/alc/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/sound/sound/Makefile#6 integrate .. //depot/projects/vimage/src/sys/net/bpf.c#38 integrate .. //depot/projects/vimage/src/sys/net/flowtable.c#4 integrate .. //depot/projects/vimage/src/sys/net/flowtable.h#3 integrate .. //depot/projects/vimage/src/sys/net/if.c#86 integrate .. //depot/projects/vimage/src/sys/net/if_arcsubr.c#8 integrate .. //depot/projects/vimage/src/sys/net/if_bridge.c#31 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#44 integrate .. //depot/projects/vimage/src/sys/net/if_fddisubr.c#11 integrate .. //depot/projects/vimage/src/sys/net/if_fwsubr.c#13 integrate .. //depot/projects/vimage/src/sys/net/if_gif.c#33 integrate .. //depot/projects/vimage/src/sys/net/if_iso88025subr.c#11 integrate .. //depot/projects/vimage/src/sys/net/if_tap.c#13 integrate .. //depot/projects/vimage/src/sys/net/if_tun.c#18 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#40 integrate .. //depot/projects/vimage/src/sys/net/rtsock.c#38 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.c#37 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211.h#18 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_ccmp.c#8 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_dfs.c#5 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.c#17 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#25 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_node.h#18 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.h#20 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_sta.c#15 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ipfw.c#5 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_ipfw.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/igmp.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/ip_dummynet.h#7 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw.h#33 integrate .. //depot/projects/vimage/src/sys/netinet/ipfw/ip_dummynet.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/ipfw/ip_fw2.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/ipfw/ip_fw_pfil.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_debug.c#6 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#55 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#35 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#36 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#37 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#50 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#21 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#32 integrate .. //depot/projects/vimage/src/sys/netipx/spx_debug.c#5 integrate .. //depot/projects/vimage/src/sys/nfsclient/nfs_bio.c#15 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/machdep.c#14 integrate .. //depot/projects/vimage/src/sys/powerpc/aim/platform_chrp.c#2 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/openpic.c#8 integrate .. //depot/projects/vimage/src/sys/powerpc/psim/ata_iobus.c#2 integrate .. //depot/projects/vimage/src/sys/rpc/clnt_rc.c#6 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_pipe.c#14 integrate .. //depot/projects/vimage/src/sys/sys/bio.h#2 integrate .. //depot/projects/vimage/src/sys/sys/buf_ring.h#5 integrate .. //depot/projects/vimage/src/sys/sys/bus.h#6 integrate .. //depot/projects/vimage/src/sys/sys/event.h#4 integrate .. //depot/projects/vimage/src/sys/sys/soundcard.h#4 integrate .. //depot/projects/vimage/src/sys/sys/vimage.h#99 integrate .. //depot/projects/vimage/src/sys/tools/emu10k1-mkalsa.sh#2 delete .. //depot/projects/vimage/src/sys/tools/feeder_eq_mkfilter.awk#2 delete .. //depot/projects/vimage/src/sys/tools/feeder_rate_mkfilter.awk#2 delete .. //depot/projects/vimage/src/sys/tools/snd_fxdiv_gen.awk#2 delete .. //depot/projects/vimage/src/sys/tools/sound/emu10k1-mkalsa.sh#1 branch .. //depot/projects/vimage/src/sys/tools/sound/feeder_eq_mkfilter.awk#1 branch .. //depot/projects/vimage/src/sys/tools/sound/feeder_rate_mkfilter.awk#1 branch .. //depot/projects/vimage/src/sys/tools/sound/snd_fxdiv_gen.awk#1 branch .. //depot/projects/vimage/src/sys/vm/vm_map.c#18 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man4/Makefile#11 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.451 2009/05/27 18:57:13 bms Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.453 2009/06/10 03:35:40 sam Exp $ MAN= aac.4 \ acpi.4 \ @@ -23,6 +23,7 @@ ahc.4 \ ahd.4 \ aio.4 \ + alc.4 \ ale.4 \ altq.4 \ amd.4 \ @@ -203,6 +204,8 @@ msk.4 \ mtio.4 \ multicast.4 \ + mwl.4 \ + mwlfw.4 \ mxge.4 \ my.4 \ natm.4 \ ==== //depot/projects/vimage/src/share/man/man4/altq.4#6 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/altq.4,v 1.39 2009/05/21 02:47:46 yongari Exp $ +.\" $FreeBSD: src/share/man/man4/altq.4,v 1.40 2009/06/10 02:19:54 yongari Exp $ .\" -.Dd May 21, 2009 +.Dd June 10, 2009 .Dt ALTQ 4 .Os .Sh NAME @@ -116,6 +116,7 @@ .Nm . They have been applied to the following hardware drivers: .Xr age 4 , +.Xr alc 4 , .Xr ale 4 , .Xr an 4 , .Xr ath 4 , ==== //depot/projects/vimage/src/share/man/man4/iwn.4#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/iwn.4,v 1.4 2009/05/09 19:19:30 sam Exp $ +.\" $FreeBSD: src/share/man/man4/iwn.4,v 1.5 2009/06/10 03:28:34 sam Exp $ .\" .Dd April 13, 2008 .Os @@ -49,13 +49,6 @@ .Bd -literal -offset indent if_iwn_load="YES" .Ed -.Pp -In both cases, place the following line in -.Xr loader.conf 5 -to acknowledge the firmware license (see below): -.Bd -literal -offset indent -legal.intel_iwn.license_ack=1 -.Ed .Sh DESCRIPTION The .Nm @@ -76,18 +69,6 @@ This driver requires the firmware built with the .Nm iwnfw module to work. -For the loaded firmware to be enabled for use the license at -.Pa /usr/share/doc/legal/intel_iwn/LICENSE -must be agreed by adding the following line to -.Xr loader.conf 5 : -.Pp -.Dl "legal.intel_iwn.license_ack=1" -.Sh FILES -.Bl -tag -width ".Pa /usr/share/doc/legal/intel_iwn/LICENSE" -compact -.It Pa /usr/share/doc/legal/intel_iwn/LICENSE -.Nm -firmware license -.El .Sh EXAMPLES Join an existing BSS network (i.e., connect to an access point): .Pp @@ -130,9 +111,7 @@ subsystem. Verify the .Xr iwnfw 4 -firmware module is installed and the license agreement -.Xr loader 8 -tunable has been set. +firmware module is present. .It "iwn%d: could not load boot firmware" An attempt to upload the boot firmware image to the onboard microcontroller failed. ==== //depot/projects/vimage/src/share/man/man4/miibus.4#2 (text+ko) ==== @@ -6,9 +6,9 @@ .\" Originally this file looked much like the NetBSD mii(4) manual page, but .\" I doubt you would ever notice due to large differences. .\" -.\" $FreeBSD: src/share/man/man4/miibus.4,v 1.26 2008/11/12 10:31:06 yongari Exp $ +.\" $FreeBSD: src/share/man/man4/miibus.4,v 1.27 2009/06/10 02:19:54 yongari Exp $ .\" -.Dd November 12, 2008 +.Dd June 10, 2009 .Dt MIIBUS 4 .Os .Sh NAME @@ -47,6 +47,8 @@ .Bl -tag -compact -width ".Xr fxp 4" .It Xr age 4 Attansic/Atheros L1 Gigabit Ethernet +.It Xr alc 4 +Atheros AR8131/AR8132 PCIe Ethernet .It Xr ale 4 Atheros AR8121/AR8113/AR8114 PCIe Ethernet .It Xr aue 4 @@ -127,6 +129,7 @@ but as a result are not well behaved newbus device drivers. .Sh SEE ALSO .Xr age 4 , +.Xr alc 4 , .Xr ale 4 , .Xr arp 4 , .Xr aue 4 , ==== //depot/projects/vimage/src/share/man/man4/ng_ipfw.4#2 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ng_ipfw.4,v 1.2 2005/02/07 08:17:51 glebius Exp $ +.\" $FreeBSD: src/share/man/man4/ng_ipfw.4,v 1.3 2009/06/09 21:35:42 oleg Exp $ .\" -.Dd February 5, 2005 +.Dd June 10, 2009 .Dt NG_IPFW 4 .Os .Sh NAME @@ -84,11 +84,12 @@ struct ng_ipfw_tag { struct m_tag mt; /* tag header */ struct ip_fw *rule; /* matching rule */ + uint32_t rule_id; /* matching rule id */ + uint32_t chain_id; /* ruleset id */ struct ifnet *ifp; /* interface, for ip_output */ int dir; /* packet direction */ #define NG_IPFW_OUT 0 #define NG_IPFW_IN 1 - int flags; /* flags, for ip_output() */ }; .Ed .Pp ==== //depot/projects/vimage/src/share/man/man4/vlan.4#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.51 2009/04/20 15:01:45 antoine Exp $ +.\" $FreeBSD: src/share/man/man4/vlan.4,v 1.52 2009/06/10 02:19:54 yongari Exp $ .\" -.Dd November 12, 2008 +.Dd June 10, 2009 .Dt VLAN 4 .Os .Sh NAME @@ -123,6 +123,7 @@ in the hardware is limited to the following devices: .Xr ae 4 , .Xr age 4 , +.Xr alc 4 , .Xr ale 4 , .Xr bce 4 , .Xr bge 4 , ==== //depot/projects/vimage/src/share/man/man9/Makefile#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.353 2009/06/07 21:31:06 rwatson 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 \ @@ -28,12 +28,15 @@ bus_dma.9 \ bus_generic_attach.9 \ bus_generic_detach.9 \ + bus_generic_new_pass.9 \ bus_generic_print_child.9 \ bus_generic_read_ivar.9 \ bus_generic_shutdown.9 \ + BUS_NEW_PASS.9 \ BUS_PRINT_CHILD.9 \ BUS_READ_IVAR.9 \ bus_release_resource.9 \ + bus_set_pass.9 \ bus_set_resource.9 \ BUS_SETUP_INTR.9 \ bus_space.9 \ @@ -54,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 \ @@ -552,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/vimage/src/sys/amd64/conf/DEFAULTS#10 (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/src/sys/amd64/conf/GENERIC#32 (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/src/sys/arm/arm/intr.c#8 (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/src/sys/arm/arm/locore.S#8 (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/src/sys/arm/at91/at91.c#12 (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/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/src/sys/arm/include/intr.h#9 (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/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/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/src/sys/arm/xscale/i80321/i80321.c#3 (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/src/sys/arm/xscale/i8134x/i81342.c#3 (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/src/sys/arm/xscale/ixp425/ixp425.c#10 (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/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/src/sys/boot/forth/loader.conf#21 (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/src/sys/cam/scsi/scsi_target.c#7 (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/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/src/sys/compat/freebsd32/freebsd32_proto.h#21 (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/src/sys/compat/freebsd32/freebsd32_syscall.h#21 (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/src/sys/compat/freebsd32/freebsd32_syscalls.c#21 (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/src/sys/compat/freebsd32/freebsd32_sysent.c#22 (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/src/sys/compat/freebsd32/syscalls.master#22 (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/src/sys/conf/NOTES#55 (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. # @@ -1756,6 +1756,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. @@ -1898,6 +1899,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/src/sys/conf/files#72 (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 \ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200906111727.n5BHRu5X007713>