From owner-p4-projects@FreeBSD.ORG Sun Sep 13 21:40:51 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07BEC1065676; Sun, 13 Sep 2009 21:40:51 +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 A77B5106566C for ; Sun, 13 Sep 2009 21:40:50 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 94A4B8FC0C for ; Sun, 13 Sep 2009 21:40:50 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n8DLeoAp088181 for ; Sun, 13 Sep 2009 21:40:50 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n8DLeotf088179 for perforce@freebsd.org; Sun, 13 Sep 2009 21:40:50 GMT (envelope-from zec@fer.hr) Date: Sun, 13 Sep 2009 21:40:50 GMT Message-Id: <200909132140.n8DLeotf088179@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 168517 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Sep 2009 21:40:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=168517 Change 168517 by zec@zec_tpx32 on 2009/09/13 21:39:54 IFC @ 168505 (primarily in order to merge in the recent mcast fixes) Affected files ... .. //depot/projects/vimage/src/share/man/man4/inet6.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/syscons.4#2 integrate .. //depot/projects/vimage/src/share/man/man4/textdump.4#4 integrate .. //depot/projects/vimage/src/share/man/man5/device.hints.5#2 integrate .. //depot/projects/vimage/src/share/man/man5/rc.conf.5#10 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#18 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/initcpu.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/msi.c#12 integrate .. //depot/projects/vimage/src/sys/amd64/include/specialreg.h#16 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_proto.h#10 integrate .. //depot/projects/vimage/src/sys/boot/i386/libi386/pxe.c#4 integrate .. //depot/projects/vimage/src/sys/boot/pc98/Makefile.inc#4 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_target.c#9 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#16 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_proto.h#3 integrate .. //depot/projects/vimage/src/sys/conf/files#79 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/acpica_prep.sh#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/changes.txt#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmrestag.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmtable.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmtbdump.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/common/dmtbinfo.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcompiler.l#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslcompiler.y#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asldefine.h#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslfiles.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslglobal.h#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslload.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asllookup.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslmain.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslmap.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/aslstubs.c#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/compiler/asltypes.h#4 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/debugger/dbcmds.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/debugger/dbdisply.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/debugger/dbexec.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dispatcher/dsfield.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dispatcher/dsmthdat.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dispatcher/dsobject.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/dispatcher/dswload.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evgpe.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evgpeblk.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/events/evrgnini.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exconfig.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exfield.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exfldio.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exstorob.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/executer/exutils.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/hardware/hwgpe.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/hardware/hwregs.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/hardware/hwsleep.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/hardware/hwtimer.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/hardware/hwxface.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acconfig.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acdebug.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acdisasm.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acglobal.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/achware.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acinterp.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/aclocal.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acmacros.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acnamesp.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acobject.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acparser.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acpixf.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acpredef.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/actbl.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/actbl1.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/actbl2.h#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/actypes.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/acutils.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/include/amlcode.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsalloc.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nseval.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsinit.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsload.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nspredef.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsrepair.c#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/namespace/nsxfname.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/parser/psloop.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/parser/psxface.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/tables/tbutils.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/uteval.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/utglobal.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/utids.c#1 branch .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/utinit.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/utmisc.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/dev/acpica/utilities/utxface.c#2 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#25 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_cpu.c#15 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_pcib_acpi.c#10 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpivar.h#11 integrate .. //depot/projects/vimage/src/sys/dev/agp/agp_i810.c#9 integrate .. //depot/projects/vimage/src/sys/dev/amdtemp/amdtemp.c#4 integrate .. //depot/projects/vimage/src/sys/dev/drm/drm_pciids.h#11 integrate .. //depot/projects/vimage/src/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_em.c#17 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_igb.c#14 integrate .. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.c#11 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe.c#12 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_user.c#7 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#16 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcivar.h#9 integrate .. //depot/projects/vimage/src/sys/dev/syscons/daemon/daemon_saver.c#10 integrate .. //depot/projects/vimage/src/sys/dev/syscons/scterm-teken.c#8 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.c#17 integrate .. //depot/projects/vimage/src/sys/dev/syscons/syscons.h#8 integrate .. //depot/projects/vimage/src/sys/fs/fifofs/fifo_vnops.c#16 integrate .. //depot/projects/vimage/src/sys/i386/acpica/acpi_machdep.c#13 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/hwpstate.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#19 integrate .. //depot/projects/vimage/src/sys/i386/i386/msi.c#12 integrate .. //depot/projects/vimage/src/sys/i386/i386/pmap.c#33 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_proto.h#3 integrate .. //depot/projects/vimage/src/sys/i386/include/specialreg.h#16 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/xen-os.h#4 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_proto.h#10 integrate .. //depot/projects/vimage/src/sys/i386/xen/locore.s#5 integrate .. //depot/projects/vimage/src/sys/i386/xen/pmap.c#13 integrate .. //depot/projects/vimage/src/sys/kern/kern_event.c#13 integrate .. //depot/projects/vimage/src/sys/kern/kern_shutdown.c#16 integrate .. //depot/projects/vimage/src/sys/kern/kern_sig.c#22 integrate .. //depot/projects/vimage/src/sys/kern/kern_timeout.c#19 integrate .. //depot/projects/vimage/src/sys/kern/subr_bus.c#24 integrate .. //depot/projects/vimage/src/sys/kern/sys_pipe.c#14 integrate .. //depot/projects/vimage/src/sys/kern/tty.c#42 integrate .. //depot/projects/vimage/src/sys/kern/tty_pts.c#21 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mqueue.c#15 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#44 integrate .. //depot/projects/vimage/src/sys/kern/vfs_aio.c#12 integrate .. //depot/projects/vimage/src/sys/kern/vfs_subr.c#34 integrate .. //depot/projects/vimage/src/sys/modules/acpi/acpi/Makefile#8 integrate .. //depot/projects/vimage/src/sys/modules/dtrace/lockstat/Makefile#2 integrate .. //depot/projects/vimage/src/sys/net/bpf.c#43 integrate .. //depot/projects/vimage/src/sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/in_mcast.c#34 integrate .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#28 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#46 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#47 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#47 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#63 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#59 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.h#20 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#40 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#41 integrate .. //depot/projects/vimage/src/sys/netsmb/smb_dev.c#7 integrate .. //depot/projects/vimage/src/sys/pci/intpm.c#10 integrate .. //depot/projects/vimage/src/sys/pci/intpmreg.h#3 integrate .. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#27 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pci.h#6 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/psycho.c#16 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/schizo.c#6 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/jbusppm.c#3 integrate .. //depot/projects/vimage/src/sys/sys/bus.h#10 integrate .. //depot/projects/vimage/src/sys/teken/teken.c#2 integrate .. //depot/projects/vimage/src/sys/teken/teken.h#2 integrate .. //depot/projects/vimage/src/sys/teken/teken_demo.c#2 integrate .. //depot/projects/vimage/src/sys/teken/teken_subr.h#2 integrate .. //depot/projects/vimage/src/sys/teken/teken_subr_compat.h#2 integrate Differences ... ==== //depot/projects/vimage/src/share/man/man4/inet6.4#2 (text+ko) ==== @@ -27,9 +27,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/inet6.4,v 1.20 2005/08/25 13:47:41 glebius Exp $ +.\" $FreeBSD: src/share/man/man4/inet6.4,v 1.21 2009/09/12 22:08:20 hrs Exp $ .\" -.Dd January 29, 1999 +.Dd September 2, 2009 .Dt INET6 4 .Os .Sh NAME @@ -307,7 +307,8 @@ The flag is provided basically for avoiding possible DoS attacks. .It Dv IPV6CTL_ACCEPT_RTADV .Pq ip6.accept_rtadv -Boolean: enable/disable receiving of +Boolean: the default value of a per-interface flag to +enable/disable receiving of .Tn ICMPv6 router advertisement packets, and autoconfiguration of address prefixes and default routers. @@ -315,6 +316,11 @@ (not a router) for the option to be meaningful. Defaults to off. +.It Dv IPV6CTL_AUTO_LINKLOCAL +.Pq ip6.auto_linklocal +Boolean: the default value of a per-interface flag to +enable/disable performing automatic link-local address configuration. +Defaults to on. .It Dv IPV6CTL_KEEPFAITH .Pq ip6.keepfaith Boolean: enable/disable ==== //depot/projects/vimage/src/share/man/man4/syscons.4#2 (text+ko) ==== @@ -24,9 +24,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/syscons.4,v 1.45 2006/12/14 16:40:57 mpp Exp $ +.\" $FreeBSD: src/share/man/man4/syscons.4,v 1.47 2009/09/12 00:12:47 delphij Exp $ .\" -.Dd October 22, 2006 +.Dd September 11, 2009 .Dt SYSCONS 4 .Os .Sh NAME @@ -61,6 +61,7 @@ In .Pa /boot/device.hints : .Cd hint.sc.0.at="isa" +.Cd hint.sc.0.vesa_mode=0x103 .Sh DESCRIPTION The .Nm @@ -325,7 +326,7 @@ most other systems, and it adds substantial amount of code to syscons. If this option is NOT defined, you can reduce the kernel size a lot. See the -.Dv VESA800X600 +.Dv VESAMODE flag below. .It Dv SC_TWOBUTTON_MOUSE If you have a two button mouse, you may want to add this option @@ -426,15 +427,18 @@ .\".It bit 6 (QUIET_BELL) .\"This option suppresses the bell, whether audible or visual, .\"if it is rung in a background virtual terminal. -.It 0x0080 (VESA800X600) -This option puts the video card in the VESA 800x600 pixel, 16 color -mode. -It may be useful for laptop computers for which the 800x600 mode -is otherwise unsupported by the X server. +.It 0x0080 (VESAMODE) +This option puts the video card in the VESA mode specified by +.Pa /boot/device.hints +variable +.Va vesa_mode +during kernel initialization. Note that in order for this flag to work, the kernel must be compiled with the .Dv SC_PIXEL_MODE option explained above. +A list of the available mode can be obtained via +.Xr vidcontrol 1 . .\"Note also that the ``copy-and-paste'' function is not currently supported .\"in this mode and the mouse pointer will not be displayed. .It 0x0100 (AUTODETECT_KBD) ==== //depot/projects/vimage/src/share/man/man4/textdump.4#4 (text+ko) ==== @@ -25,7 +25,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.7 2009/04/11 22:39:38 kientzle Exp $ +.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.8 2009/09/12 01:37:22 des Exp $ .\" .Dd December 24, 2008 .Dt textdump 4 @@ -138,7 +138,7 @@ reboot: .Bd -literal -offset indent script kdb.enter.panic=textdump set; capture on; show allpcpu; bt; - ps; alltrace; show alllock; call doadump; reset + ps; alltrace; show alllocks; call doadump; reset .Ed .Pp In the following example, the script ==== //depot/projects/vimage/src/share/man/man5/device.hints.5#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/device.hints.5,v 1.10 2003/09/19 22:27:54 jb Exp $ +.\" $FreeBSD: src/share/man/man5/device.hints.5,v 1.11 2009/09/12 00:28:05 delphij Exp $ .\" -.Dd October 7, 2001 +.Dd September 11, 2009 .Dt DEVICE.HINTS 5 .Os .Sh NAME @@ -112,7 +112,8 @@ .El .Pp A device driver may require one or more hint lines with these keywords, -and may accept other keywords not listed here. +and may accept other keywords not listed here, through +.Xr resource_int_value 9 . Consult individual device drivers' manual pages for available keywords and their possible values. .\" .Sh CONTROL VARIABLES @@ -160,7 +161,8 @@ .Sh SEE ALSO .Xr kenv 1 , .Xr loader.conf 5 , -.Xr loader 8 +.Xr loader 8, +.Xr resource_int_value 9 . .Sh HISTORY The .Nm ==== //depot/projects/vimage/src/share/man/man5/rc.conf.5#10 (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/man5/rc.conf.5,v 1.361 2009/08/25 19:07:26 delphij Exp $ +.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.362 2009/09/12 22:22:31 hrs Exp $ .\" -.Dd August 25, 2009 +.Dd September 2, 2009 .Dt RC.CONF 5 .Os .Sh NAME @@ -344,11 +344,6 @@ .Xr dhclient 8 is used to set the hostname via DHCP, this variable should be set to an empty string. -.It Va ipv6_enable -.Pq Vt bool -Enable support for IPv6 networking. -Note that this requires that the kernel has been compiled with -.Cd "options INET6" . .It Va nisdomainname .Pq Vt str The NIS domain name of this host, or @@ -1251,28 +1246,45 @@ Instead of setting the ifconfig variables as .Va ifconfig_ Ns Aq Ar interface they should be set as -.Va ipv6_ifconfig_ Ns Aq Ar interface . +.Va ifconfig_ Ns Ao Ar interface Ac Ns _ipv6. Aliases should be set as -.Va ipv6_ifconfig_ Ns Ao Ar interface Ac Ns Va _alias Ns Aq Ar n . +.Va ifconfig_ Ns Ao Ar interface Ac Ns Va _alias Ns Aq Ar n . .Va ipv6_prefix_ Ns Aq Ar interface does something. -Interfaces that do not have a -.Va ipv6_ifconfig_ Ns Aq Ar interface -setting will be auto configured by +Interfaces that have a +.Fl accept_rtadv +flag in +.Va ifconfig_ Ns Ao Ar interface Ac Ns _ipv6 +setting will be automatically configured by .Xr rtsol 8 if the .Va ipv6_gateway_enable is set to .Dq Li NO . -Note that the IPv6 networking code does not support the -.Pa /etc/start_if. Ns Aq Ar interface -files. .It Va ipv6_default_interface .Pq Vt str If not set to .Dq Li NO , this is the default output interface for scoped addresses. Now this works only for IPv6 link local multicast addresses. +.It Va ip6addrctl_enable +.Pq Vt bool +If set to +.Dq Li YES , +install default address selection policy table +.Pq RFC 3484 . +If a file +.Pa /etc/ip6addrctl.conf +is found the +.Xr ip6addrctl 8 +reads and installs it. +If not, a pre-defined policy table will be installed. +There are two pre-defined ones; IPv4-preferred and IPv6-preferred. +If set +.Va ipv6_prefer +variable to +.Dq Li YES +the IPv6-preferred one is used. Default is IPv4-preferred. .It Va cloned_interfaces .Pq Vt str Set to the list of clonable network interfaces to create on this host. @@ -2300,48 +2312,48 @@ .Pq Vt bool The IPv6 equivalent of .Va gateway_enable . -.It Va router_enable +.It Va routed_enable .Pq Vt bool If set to .Dq Li YES , run a routing daemon of some sort, based on the settings of -.Va router +.Va routed_program and -.Va router_flags . -.It Va ipv6_router_enable +.Va routed_flags . +.It Va route6d_enable .Pq Vt bool The IPv6 equivalent of -.Va router_enable . +.Va routed_enable . If set to .Dq Li YES , run a routing daemon of some sort, based on the settings of -.Va ipv6_router +.Va route6d_program and -.Va ipv6_router_flags . -.It Va router +.Va route6d_flags . +.It Va routed_program .Pq Vt str If -.Va router_enable +.Va routed_enable is set to .Dq Li YES , this is the name of the routing daemon to use. -.It Va ipv6_router +.It Va route6d_program .Pq Vt str The IPv6 equivalent of -.Va router . -.It Va router_flags +.Va routed_program . +.It Va routed_flags .Pq Vt str If -.Va router_enable +.Va routed_enable is set to .Dq Li YES , these are the flags to pass to the routing daemon. -.It Va ipv6_router_flags +.It Va route6d_flags .Pq Vt str The IPv6 equivalent of -.Va router_flags . +.Va routed_flags . .It Va mrouted_enable .Pq Vt bool If set to ==== //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#18 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.174 2009/06/30 11:16:32 avg Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.175 2009/09/10 17:27:36 jkim Exp $"); #include "opt_cpu.h" @@ -371,21 +371,21 @@ switch (cpu_vendor_id) { case CPU_VENDOR_AMD: if ((amd_pminfo & AMDPM_TSC_INVARIANT) || - AMD64_CPU_FAMILY(cpu_id) >= 0x10 || + CPUID_TO_FAMILY(cpu_id) >= 0x10 || cpu_id == 0x60fb2) tsc_is_invariant = 1; break; case CPU_VENDOR_INTEL: if ((amd_pminfo & AMDPM_TSC_INVARIANT) || - (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xe) || - (AMD64_CPU_FAMILY(cpu_id) == 0xf && - AMD64_CPU_MODEL(cpu_id) >= 0x3)) + (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xe) || + (CPUID_TO_FAMILY(cpu_id) == 0xf && + CPUID_TO_MODEL(cpu_id) >= 0x3)) tsc_is_invariant = 1; break; case CPU_VENDOR_CENTAUR: - if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf && + if (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf && (rdmsr(0x1203) & 0x100000000ULL) == 0) tsc_is_invariant = 1; break; ==== //depot/projects/vimage/src/sys/amd64/amd64/initcpu.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.54 2009/07/22 14:32:38 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.55 2009/09/10 17:27:36 jkim Exp $"); #include "opt_cpu.h" @@ -154,8 +154,8 @@ pg_nx = PG_NX; } if (cpu_vendor_id == CPU_VENDOR_CENTAUR && - AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf) + CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf) init_via(); /* ==== //depot/projects/vimage/src/sys/amd64/amd64/msi.c#12 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.14 2009/07/06 18:23:00 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.15 2009/09/10 17:27:36 jkim Exp $"); #include #include @@ -275,8 +275,8 @@ case CPU_VENDOR_AMD: break; case CPU_VENDOR_CENTAUR: - if (AMD64_CPU_FAMILY(cpu_id) == 0x6 && - AMD64_CPU_MODEL(cpu_id) >= 0xf) + if (CPUID_TO_FAMILY(cpu_id) == 0x6 && + CPUID_TO_MODEL(cpu_id) >= 0xf) break; /* FALLTHROUGH */ default: ==== //depot/projects/vimage/src/sys/amd64/include/specialreg.h#16 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.55 2009/05/13 17:53:04 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.56 2009/09/10 17:27:36 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -168,10 +168,10 @@ #define CPUID_FAMILY 0x00000f00 #define CPUID_EXT_MODEL 0x000f0000 #define CPUID_EXT_FAMILY 0x0ff00000 -#define AMD64_CPU_MODEL(id) \ +#define CPUID_TO_MODEL(id) \ ((((id) & CPUID_MODEL) >> 4) | \ (((id) & CPUID_EXT_MODEL) >> 12)) -#define AMD64_CPU_FAMILY(id) \ +#define CPUID_TO_FAMILY(id) \ ((((id) & CPUID_FAMILY) >> 8) + \ (((id) & CPUID_EXT_FAMILY) >> 20)) ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_proto.h#10 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.39 2008/11/29 14:57:58 kib Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux32_proto.h,v 1.40 2009/09/10 13:20:27 des Exp $ * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 185438 2008-11-29 14:55:24Z kib */ @@ -1257,6 +1257,13 @@ #endif /* COMPAT_FREEBSD6 */ + +#ifdef COMPAT_FREEBSD7 + +#define nosys linux_nosys + +#endif /* COMPAT_FREEBSD7 */ + #define LINUX_SYS_AUE_linux_fork AUE_FORK #define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC #define LINUX_SYS_AUE_linux_waitpid AUE_WAIT4 ==== //depot/projects/vimage/src/sys/boot/i386/libi386/pxe.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.23 2007/10/12 17:09:43 ps Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/pxe.c,v 1.24 2009/09/10 22:05:43 emaste Exp $"); #include #include @@ -282,7 +282,7 @@ bootp(pxe_sock, BOOTP_PXE); if (rootip.s_addr == 0) rootip.s_addr = bootplayer.sip; - if (!rootpath[1]) + if (!rootpath[0]) strcpy(rootpath, PXENFSROOTPATH); for (i = 0; rootpath[i] != '\0' && i < FNAME_SIZE; i++) ==== //depot/projects/vimage/src/sys/boot/pc98/Makefile.inc#4 (text+ko) ==== @@ -1,10 +1,10 @@ # Common defines for all of /sys/boot/pc98/ # -# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.8 2008/06/25 21:33:28 ru Exp $ +# $FreeBSD: src/sys/boot/pc98/Makefile.inc,v 1.9 2009/09/13 11:20:17 nyan Exp $ BINDIR?= /boot -LOADER_ADDRESS?=0x100000 +LOADER_ADDRESS?=0x200000 CFLAGS+= -ffreestanding -mpreferred-stack-boundary=2 \ -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \ -Os ==== //depot/projects/vimage/src/sys/cam/scsi/scsi_target.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.78 2009/06/25 18:46:30 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_target.c,v 1.79 2009/09/12 20:03:45 rwatson Exp $"); #include @@ -103,8 +103,11 @@ static d_kqfilter_t targkqfilter; static void targreadfiltdetach(struct knote *kn); static int targreadfilt(struct knote *kn, long hint); -static struct filterops targread_filtops = - { 1, NULL, targreadfiltdetach, targreadfilt }; +static struct filterops targread_filtops = { + .f_isfd = 1, + .f_detach = targreadfiltdetach, + .f_event = targreadfilt, +}; static struct cdevsw targ_cdevsw = { .d_version = D_VERSION, ==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#4 (text+ko) ==== @@ -231,8 +231,27 @@ /* * Convert between znode pointers and vnode pointers */ +#ifdef DEBUG +static __inline vnode_t * +ZTOV(znode_t *zp) +{ + vnode_t *vp = zp->z_vnode; + + ASSERT(vp == NULL || vp->v_data == NULL || vp->v_data == zp); + return (vp); +} +static __inline znode_t * +VTOZ(vnode_t *vp) +{ + znode_t *zp = (znode_t *)vp->v_data; + + ASSERT(zp == NULL || zp->z_vnode == NULL || zp->z_vnode == vp); + return (zp); +} +#else #define ZTOV(ZP) ((ZP)->z_vnode) #define VTOZ(VP) ((znode_t *)(VP)->v_data) +#endif /* * ZFS_ENTER() is called on entry to each ZFS vnode and vfs operation. ==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 (text+ko) ==== @@ -181,10 +181,11 @@ return (0); } -static void +static int mze_insert(zap_t *zap, int chunkid, uint64_t hash, mzap_ent_phys_t *mzep) { mzap_ent_t *mze; + avl_index_t idx; ASSERT(zap->zap_ismicro); ASSERT(RW_WRITE_HELD(&zap->zap_rwlock)); @@ -194,7 +195,12 @@ mze->mze_chunkid = chunkid; mze->mze_hash = hash; mze->mze_phys = *mzep; - avl_add(&zap->zap_m.zap_avl, mze); + if (avl_find(&zap->zap_m.zap_avl, mze, &idx) != NULL) { + kmem_free(mze, sizeof (mzap_ent_t)); + return (EEXIST); + } + avl_insert(&zap->zap_m.zap_avl, mze, idx); + return (0); } static mzap_ent_t * @@ -329,10 +335,15 @@ if (mze->mze_name[0]) { zap_name_t *zn; - zap->zap_m.zap_num_entries++; zn = zap_name_alloc(zap, mze->mze_name, MT_EXACT); - mze_insert(zap, i, zn->zn_hash, mze); + if (mze_insert(zap, i, zn->zn_hash, mze) == 0) + zap->zap_m.zap_num_entries++; + else { + printf("ZFS WARNING: Duplicated ZAP " + "entry detected (%s).", + mze->mze_name); + } zap_name_free(zn); } } @@ -771,7 +782,7 @@ if (zap->zap_m.zap_alloc_next == zap->zap_m.zap_num_chunks) zap->zap_m.zap_alloc_next = 0; - mze_insert(zap, i, zn->zn_hash, mze); + VERIFY(0 == mze_insert(zap, i, zn->zn_hash, mze)); return; } } ==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#8 (text+ko) ==== @@ -947,6 +947,18 @@ zfsvfs->z_unmounted = B_TRUE; rrw_exit(&zfsvfs->z_teardown_lock, FTAG); rw_exit(&zfsvfs->z_teardown_inactive_lock); + +#ifdef __FreeBSD__ + /* + * Some znodes might not be fully reclaimed, wait for them. + */ + mutex_enter(&zfsvfs->z_znodes_lock); + while (list_head(&zfsvfs->z_all_znodes) != NULL) { + msleep(zfsvfs, &zfsvfs->z_znodes_lock, 0, + "zteardown", 0); + } + mutex_exit(&zfsvfs->z_znodes_lock); +#endif } /* @@ -1137,6 +1149,8 @@ credanonp, numsecflavors, secflavors)); } +CTASSERT(SHORT_FID_LEN <= sizeof(struct fid)); +CTASSERT(LONG_FID_LEN <= sizeof(struct fid)); static int zfs_fhtovp(vfs_t *vfsp, fid_t *fidp, vnode_t **vpp) ==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#16 (text+ko) ==== @@ -1185,8 +1185,6 @@ } } - ZFS_EXIT(zfsvfs); - /* Translate errors and add SAVENAME when needed. */ if (cnp->cn_flags & ISLASTCN) { switch (nameiop) { @@ -1217,6 +1215,7 @@ if (error != 0) { VN_RELE(*vpp); *vpp = NULL; + ZFS_EXIT(zfsvfs); return (error); } } @@ -1238,6 +1237,8 @@ } #endif + ZFS_EXIT(zfsvfs); + return (error); } @@ -4343,11 +4344,20 @@ znode_t *zp = arg; zfsvfs_t *zfsvfs = zp->z_zfsvfs; - ZFS_LOG(1, "zp=%p", zp); - ZFS_OBJ_HOLD_ENTER(zfsvfs, zp->z_id); - zfs_znode_dmu_fini(zp); - ZFS_OBJ_HOLD_EXIT(zfsvfs, zp->z_id); + rw_enter(&zfsvfs->z_teardown_inactive_lock, RW_READER); + if (zp->z_dbuf != NULL) { + ZFS_OBJ_HOLD_ENTER(zfsvfs, zp->z_id); + zfs_znode_dmu_fini(zp); + ZFS_OBJ_HOLD_EXIT(zfsvfs, zp->z_id); + } zfs_znode_free(zp); + rw_exit(&zfsvfs->z_teardown_inactive_lock); + /* + * If the file system is being unmounted, there is a process waiting + * for us, wake it up. + */ + if (zfsvfs->z_unmounted) + wakeup_one(zfsvfs); } static int @@ -4359,6 +4369,9 @@ { vnode_t *vp = ap->a_vp; znode_t *zp = VTOZ(vp); + zfsvfs_t *zfsvfs = zp->z_zfsvfs; + + rw_enter(&zfsvfs->z_teardown_inactive_lock, RW_READER); ASSERT(zp != NULL); @@ -4369,7 +4382,7 @@ mutex_enter(&zp->z_lock); ASSERT(zp->z_phys != NULL); - ZTOV(zp) = NULL; + zp->z_vnode = NULL; mutex_exit(&zp->z_lock); if (zp->z_unlinked) @@ -4377,7 +4390,6 @@ else if (zp->z_dbuf == NULL) zfs_znode_free(zp); else /* if (!zp->z_unlinked && zp->z_dbuf != NULL) */ { - zfsvfs_t *zfsvfs = zp->z_zfsvfs; int locked; locked = MUTEX_HELD(ZFS_OBJ_MUTEX(zfsvfs, zp->z_id)) ? 2 : @@ -4400,6 +4412,7 @@ vp->v_data = NULL; ASSERT(vp->v_holdcnt >= 1); VI_UNLOCK(vp); + rw_exit(&zfsvfs->z_teardown_inactive_lock); return (0); } ==== //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 (text+ko) ==== @@ -110,7 +110,7 @@ mutex_exit(&zp->z_lock); zfs_znode_free(zp); } else if (vp->v_count == 0) { - ZTOV(zp) = NULL; + zp->z_vnode = NULL; vhold(vp); mutex_exit(&zp->z_lock); vn_lock(vp, LK_EXCLUSIVE | LK_RETRY, curthread); @@ -890,8 +890,16 @@ if (zp->z_unlinked) { err = ENOENT; } else { - if (ZTOV(zp) != NULL) - VN_HOLD(ZTOV(zp)); + if ((vp = ZTOV(zp)) != NULL) { + VI_LOCK(vp); + if ((vp->v_iflag & VI_DOOMED) != 0) { + VI_UNLOCK(vp); + vp = NULL; + } else + VI_UNLOCK(vp); + } + if (vp != NULL) + VN_HOLD(vp); else { if (first) { ZFS_LOG(1, "dying znode detected (zp=%p)", zp); @@ -1525,7 +1533,7 @@ ZTOV(rootzp)->v_data = NULL; ZTOV(rootzp)->v_count = 0; ZTOV(rootzp)->v_holdcnt = 0; - ZTOV(rootzp) = NULL; + rootzp->z_vnode = NULL; VOP_UNLOCK(vp, 0); vdestroy(vp); dmu_buf_rele(rootzp->z_dbuf, NULL); ==== //depot/projects/vimage/src/sys/compat/svr4/svr4_proto.h#3 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.29 2009/05/08 20:16:04 ed Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_proto.h,v 1.30 2009/09/10 13:20:27 des Exp $ * created from FreeBSD: head/sys/compat/svr4/syscalls.master 160798 2006-07-28 19:05:28Z jhb */ @@ -503,6 +503,12 @@ #endif /* COMPAT_FREEBSD6 */ + +#ifdef COMPAT_FREEBSD7 + + +#endif /* COMPAT_FREEBSD7 */ + #define SVR4_SYS_AUE_svr4_sys_open AUE_NULL #define SVR4_SYS_AUE_svr4_sys_wait AUE_NULL #define SVR4_SYS_AUE_svr4_sys_creat AUE_NULL ==== //depot/projects/vimage/src/sys/conf/files#79 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1463 2009/09/09 05:53:26 delphij Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1464 2009/09/11 22:49:34 jkim Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -220,6 +220,7 @@ contrib/dev/acpica/namespace/nsobject.c optional acpi contrib/dev/acpica/namespace/nsparse.c optional acpi contrib/dev/acpica/namespace/nspredef.c optional acpi +contrib/dev/acpica/namespace/nsrepair.c optional acpi contrib/dev/acpica/namespace/nssearch.c optional acpi contrib/dev/acpica/namespace/nsutils.c optional acpi contrib/dev/acpica/namespace/nswalk.c optional acpi @@ -260,6 +261,7 @@ contrib/dev/acpica/utilities/utdelete.c optional acpi contrib/dev/acpica/utilities/uteval.c optional acpi contrib/dev/acpica/utilities/utglobal.c optional acpi +contrib/dev/acpica/utilities/utids.c optional acpi contrib/dev/acpica/utilities/utinit.c optional acpi contrib/dev/acpica/utilities/utlock.c optional acpi contrib/dev/acpica/utilities/utmath.c optional acpi ==== //depot/projects/vimage/src/sys/contrib/dev/acpica/acpica_prep.sh#4 (text+ko) ==== @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.11 2009/06/05 18:43:13 jkim Exp $ +# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.12 2009/09/11 22:48:53 jkim Exp $ # # Unpack an ACPI CA drop and restructure it to fit the FreeBSD layout # @@ -21,7 +21,7 @@ # files to remove stripdirs="acpisrc acpixtract examples generate os_specific" stripfiles="Makefile README acintel.h aclinux.h acmsvc.h acnetbsd.h \ - acos2.h accygwin.h acefi.h actbl2.h acwin.h acwin64.h aeexec.c \ + acos2.h accygwin.h acefi.h acwin.h acwin64.h aeexec.c \ aehandlers.c aemain.c aetables.c osunixdir.c readme.txt \ utclib.c" @@ -31,8 +31,8 @@ aclocal.h acmacros.h acnames.h acnamesp.h acobject.h acopcode.h \ acoutput.h acparser.h acpi.h acpiosxf.h acpixf.h acpredef.h \ acresrc.h acrestyp.h acstruct.h actables.h actbl.h actbl1.h \ - actypes.h acutils.h amlcode.h amlresrc.h platform/acenv.h \ - platform/acfreebsd.h platform/acgcc.h" + actbl2.h actypes.h acutils.h amlcode.h amlresrc.h \ + platform/acenv.h platform/acfreebsd.h platform/acgcc.h" comp_headers="aslcompiler.h asldefine.h aslglobal.h asltypes.h" platform_headers="acfreebsd.h acgcc.h" >>> TRUNCATED FOR MAIL (1000 lines) <<<