Date: Tue, 13 Nov 2007 23:32:27 GMT From: John Birrell <jb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 129044 for review Message-ID: <200711132332.lADNWR81075756@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=129044 Change 129044 by jb@jb_freebsd1 on 2007/11/13 23:32:04 IFC Affected files ... .. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#46 integrate .. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#19 integrate .. //depot/projects/dtrace/src/contrib/less/FREEBSD-upgrade#1 branch .. //depot/projects/dtrace/src/etc/freebsd-update.conf#3 integrate .. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/dtrace/src/share/man/man4/Makefile#23 integrate .. //depot/projects/dtrace/src/share/man/man4/asmc.4#1 branch .. //depot/projects/dtrace/src/share/man/man4/ipw.4#7 integrate .. //depot/projects/dtrace/src/share/man/man4/iwi.4#7 integrate .. //depot/projects/dtrace/src/share/man/man4/wlan.4#5 integrate .. //depot/projects/dtrace/src/share/man/man4/wpi.4#2 integrate .. //depot/projects/dtrace/src/share/man/man5/freebsd-update.conf.5#3 integrate .. //depot/projects/dtrace/src/share/man/man9/Makefile#20 integrate .. //depot/projects/dtrace/src/sys/boot/i386/libi386/biosdisk.c#6 integrate .. //depot/projects/dtrace/src/sys/conf/files#51 integrate .. //depot/projects/dtrace/src/sys/conf/files.amd64#22 integrate .. //depot/projects/dtrace/src/sys/conf/files.i386#26 integrate .. //depot/projects/dtrace/src/sys/conf/files.pc98#16 integrate .. //depot/projects/dtrace/src/sys/conf/kmod.mk#10 integrate .. //depot/projects/dtrace/src/sys/dev/agp/agp.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_ali.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_amd.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_amd64.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_ati.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_i810.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_if.m#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_intel.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_nvidia.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_sis.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agp_via.c#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agppriv.h#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agpreg.h#1 branch .. //depot/projects/dtrace/src/sys/dev/agp/agpvar.h#1 branch .. //depot/projects/dtrace/src/sys/dev/drm/drmP.h#7 integrate .. //depot/projects/dtrace/src/sys/dev/drm/drm_agpsupport.c#6 integrate .. //depot/projects/dtrace/src/sys/dev/re/if_re.c#10 integrate .. //depot/projects/dtrace/src/sys/dev/wpi/if_wpi.c#3 integrate .. //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_ihash.c#4 integrate .. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vfsops.c#3 integrate .. //depot/projects/dtrace/src/sys/i386/i386/locore.s#6 integrate .. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#21 integrate .. //depot/projects/dtrace/src/sys/i386/i386/mp_machdep.c#11 integrate .. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#19 integrate .. //depot/projects/dtrace/src/sys/i386/include/pmap.h#10 integrate .. //depot/projects/dtrace/src/sys/modules/agp/Makefile#6 integrate .. //depot/projects/dtrace/src/sys/netipsec/keysock.c#7 integrate .. //depot/projects/dtrace/src/sys/pci/agp.c#10 delete .. //depot/projects/dtrace/src/sys/pci/agp_ali.c#5 delete .. //depot/projects/dtrace/src/sys/pci/agp_amd.c#5 delete .. //depot/projects/dtrace/src/sys/pci/agp_amd64.c#7 delete .. //depot/projects/dtrace/src/sys/pci/agp_ati.c#6 delete .. //depot/projects/dtrace/src/sys/pci/agp_i810.c#8 delete .. //depot/projects/dtrace/src/sys/pci/agp_if.m#4 delete .. //depot/projects/dtrace/src/sys/pci/agp_intel.c#6 delete .. //depot/projects/dtrace/src/sys/pci/agp_nvidia.c#5 delete .. //depot/projects/dtrace/src/sys/pci/agp_sis.c#5 delete .. //depot/projects/dtrace/src/sys/pci/agp_via.c#6 delete .. //depot/projects/dtrace/src/sys/pci/agppriv.h#6 delete .. //depot/projects/dtrace/src/sys/pci/agpreg.h#6 delete .. //depot/projects/dtrace/src/sys/pci/agpvar.h#4 delete .. //depot/projects/dtrace/src/sys/powerpc/include/md_var.h#6 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/clock.c#10 integrate .. //depot/projects/dtrace/src/sys/powerpc/powerpc/machdep.c#11 integrate .. //depot/projects/dtrace/src/sys/sys/param.h#24 integrate .. //depot/projects/dtrace/src/tools/regression/priv/Makefile#4 integrate .. //depot/projects/dtrace/src/tools/regression/priv/main.c#4 integrate .. //depot/projects/dtrace/src/tools/regression/priv/main.h#4 integrate .. //depot/projects/dtrace/src/tools/regression/priv/priv_netinet_ipsec.c#1 branch .. //depot/projects/dtrace/src/tools/sched/schedgraph.py#6 integrate .. //depot/projects/dtrace/src/usr.bin/tee/tee.1#4 integrate .. //depot/projects/dtrace/src/usr.bin/write/write.c#4 integrate .. //depot/projects/dtrace/src/usr.sbin/freebsd-update/freebsd-update.8#4 integrate .. //depot/projects/dtrace/src/usr.sbin/freebsd-update/freebsd-update.sh#7 integrate .. //depot/projects/dtrace/src/usr.sbin/pciconf/cap.c#4 integrate .. //depot/projects/dtrace/www/en/where.sgml#12 integrate Differences ... ==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#46 (text+ko) ==== @@ -1,7 +1,7 @@ <!-- The FreeBSD Documentation Project - $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.886 2007/11/11 19:17:48 gabor Exp $ + $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.888 2007/11/12 22:06:40 jhb Exp $ --> <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [ @@ -11595,12 +11595,12 @@ <entry>700053</entry> </row> <row> - <entry>7.0-STABLE after MFC of wide and single byte + <entry>7.0-CURRENT after MFC of wide and single byte ctype separation.</entry> <entry>700054</entry> </row> <row> - <entry>700055 after ABI backwards compatibility + <entry>7.0-CURRENT after ABI backwards compatibility to the FreeBSD 4/5/6 versions of the PCIOCGETCONF, PCIOCREAD and PCIOCWRITE IOCTLs was MFC'ed, which required the ABI of the PCIOCGETCONF IOCTL to be @@ -11629,6 +11629,11 @@ broken again</entry> <entry>800003</entry> </row> + <row> + <entry>8.0-CURRENT after agp(4) driver moved from + src/sys/pci to src/sys/dev/agp</entry> + <entry>800004</entry> + </row> </tbody> </tgroup> ==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#19 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.442 2007/10/27 17:13:28 bmah Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.443 2007/11/13 16:23:53 brueffer Exp $ --> <!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//"> @@ -3257,6 +3257,7 @@ <!ENTITY man.arl.4 "<citerefentry/<refentrytitle/arl/<manvolnum/4//"> <!ENTITY man.arp.4 "<citerefentry/<refentrytitle/arp/<manvolnum/4//"> <!ENTITY man.asc.4 "<citerefentry/<refentrytitle/asc/<manvolnum/4//"> +<!ENTITY man.asmc.4 "<citerefentry/<refentrytitle/asmc/<manvolnum/4//"> <!ENTITY man.asr.4 "<citerefentry/<refentrytitle/asr/<manvolnum/4//"> <!ENTITY man.ast.4 "<citerefentry/<refentrytitle/ast/<manvolnum/4//"> <!ENTITY man.ata.4 "<citerefentry/<refentrytitle/ata/<manvolnum/4//"> @@ -3767,6 +3768,7 @@ <!ENTITY man.wlan.wep.4 "<citerefentry/<refentrytitle/wlan_wep/<manvolnum/4//"> <!ENTITY man.wlan.xauth.4 "<citerefentry/<refentrytitle/wlan_xauth/<manvolnum/4//"> <!ENTITY man.worm.4 "<citerefentry/<refentrytitle/worm/<manvolnum/4//"> +<!ENTITY man.wpi.4 "<citerefentry/<refentrytitle/wpi/<manvolnum/4//"> <!ENTITY man.wst.4 "<citerefentry/<refentrytitle/wst/<manvolnum/4//"> <!ENTITY man.wt.4 "<citerefentry/<refentrytitle/wt/<manvolnum/4//"> <!ENTITY man.wx.4 "<citerefentry/<refentrytitle/wx/<manvolnum/4//"> ==== //depot/projects/dtrace/src/etc/freebsd-update.conf#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/freebsd-update.conf,v 1.1 2006/08/31 09:51:33 cperciva Exp $ +# $FreeBSD: src/etc/freebsd-update.conf,v 1.2 2007/11/12 04:47:57 cperciva Exp $ # Trusted keyprint. Changing this is a Bad Idea unless you've received # a PGP-signed email from <security-officer@FreeBSD.org> telling you to @@ -23,9 +23,13 @@ # Paths which start with anything matching an entry in an UpdateIfUnmodified # statement will only be updated if the contents of the file have not been -# modified by the user. +# modified by the user (unless changes are merged; see below). UpdateIfUnmodified /etc/ /var/ +# When upgrading to a new FreeBSD release, files which match MergeChanges +# will have any local changes merged into the version from the new release. +MergeChanges /etc/ /var/named/etc/ + ### Default configuration options: # Directory in which to store downloaded updates and temporary @@ -46,3 +50,9 @@ # FreeBSD Update retain this modified metadata when installing a new version # of that file? # KeepModifiedMetadata yes + +# When upgrading between releases, should the list of Components be +# read strictly (StrictComponents yes) or merely as a list of components +# which *might* be installed of which FreeBSD Update should figure out +# which actually are installed and upgrade those (StrictComponents no)? +# StrictComponents no ==== //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 (text+ko) ==== @@ -18,7 +18,7 @@ <corpauthor>The &os; Documentation Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.326 2007/09/26 21:30:50 brueffer Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.327 2007/11/13 16:27:29 brueffer Exp $</pubdate> <copyright> <year>2000</year> @@ -793,6 +793,9 @@ <para>[&arch.i386;] NCR / AT&T / Lucent Technologies WaveLan T1-speed ISA/radio LAN cards (&man.wl.4; driver)</para> + <para>[&arch.i386;, &arch.amd64;] Intel PRO/Wireless 3945ABG MiniPCI + network adapters (&man.wpi.4; driver)</para> + &hwlist.zyd; </sect2> ==== //depot/projects/dtrace/src/share/man/man4/Makefile#23 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.397 2007/11/08 22:09:36 benjsc Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.399 2007/11/13 11:23:52 ru Exp $ MAN= aac.4 \ acpi.4 \ @@ -20,6 +20,7 @@ amr.4 \ an.4 \ arcmsr.4 \ + ${_asmc.4} \ asr.4 \ ata.4 \ atapicam.4 \ @@ -542,6 +543,7 @@ .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" _acpi_dock.4= acpi_dock.4 _amdsmb.4= amdsmb.4 +_asmc.4= asmc.4 _coretemp.4= coretemp.4 _hptiop.4= hptiop.4 _hptmv.4= hptmv.4 ==== //depot/projects/dtrace/src/share/man/man4/ipw.4#7 (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/ipw.4,v 1.16 2007/03/06 13:17:05 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/ipw.4,v 1.17 2007/11/13 16:42:22 brueffer Exp $ .\" .Dd March 6, 2007 .Os @@ -140,6 +140,7 @@ .Xr iwi 4 , .Xr pci 4 , .Xr wlan 4 , +.Xr wpi 4 , .Xr ifconfig 8 .Sh AUTHORS The ==== //depot/projects/dtrace/src/share/man/man4/iwi.4#7 (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/iwi.4,v 1.18 2007/03/06 13:17:05 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/iwi.4,v 1.19 2007/11/13 16:42:22 brueffer Exp $ .\" .Dd March 6, 2007 .Os @@ -145,6 +145,7 @@ .Xr ipw 4 , .Xr pci 4 , .Xr wlan 4 , +.Xr wpi 4 , .Xr ifconfig 8 .Sh AUTHORS The ==== //depot/projects/dtrace/src/share/man/man4/wlan.4#5 (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/wlan.4,v 1.13 2007/09/10 17:20:21 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/wlan.4,v 1.14 2007/11/13 16:42:22 brueffer Exp $ .\" .Dd September 6, 2007 .Dt WLAN 4 @@ -51,6 +51,7 @@ .Xr rum 4 , .Xr ural 4 , .Xr wi 4 , +.Xr wpi 4 , and .Xr zyd 4 drivers, with other drivers to follow. @@ -135,6 +136,7 @@ .Xr wlan_tkip 4 , .Xr wlan_wep 4 , .Xr wlan_xauth 4 , +.Xr wpi 4 , .Xr zyd 4 .Sh STANDARDS More information can be found in the IEEE 802.11 Standard. ==== //depot/projects/dtrace/src/share/man/man4/wpi.4#2 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/wpi.4,v 1.1 2007/11/08 21:54:42 benjsc Exp $ +.\" $FreeBSD: src/share/man/man4/wpi.4,v 1.2 2007/11/13 16:40:23 brueffer Exp $ .\" .Dd March 6, 2007 .Os @@ -52,7 +52,7 @@ firmware_load="YES" .Ed .Pp -In both cases, place the following lines in +In both cases, place the following line in .Xr loader.conf 5 to load the firmware modules: .Bd -literal -offset indent @@ -121,27 +121,29 @@ .It "wpi%d: fatal firmware error" An unknown error has occurred in the uploaded firmware, you may have to unload/reload the driver to continue. -.It "wpi%d: Radio Transmitteer is switched off" +.It "wpi%d: Radio transmitter is switched off" The hardware switch controlling the radio is currently turned off. -Data transmision is not possible in this state. +Data transmission is not possible in this state. .Sh BUGS Not all the error messages are documented here. .Pp Automatic recovery of firmware failures is not currently supported, nor is detection of toggling the radio switch on. .Pp -Background scanning is not currently supported +Background scanning is not currently supported. .El .Sh SEE ALSO .Xr altq 4 , +.Xr ipw 4 , .Xr iwi 4 , -.Xr ipw 4 , .Xr pci 4 , .Xr wlan 4 , .Xr ifconfig 8 .Sh AUTHORS +.An -nosplit The .Nm driver was written by .An Damien Bergamini Aq damien.bergamini@free.fr -.An and Benjamin Close Aq benjsc@FreeBSD.org . +and +.An Benjamin Close Aq benjsc@FreeBSD.org . ==== //depot/projects/dtrace/src/share/man/man5/freebsd-update.conf.5#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/freebsd-update.conf.5,v 1.2 2006/09/30 16:01:33 ru Exp $ +.\" $FreeBSD: src/share/man/man5/freebsd-update.conf.5,v 1.3 2007/11/12 04:47:57 cperciva Exp $ .\" .Dd August 30, 2006 .Dt FREEBSD-UPDATE.CONF 5 @@ -93,7 +93,15 @@ The parameters following this keyword are regular expressions; updates to paths which start with a string matching one of these regular expressions will be ignored if the files have -been modified locally. +been modified locally (unless they are merged -- see MergeChanges +below). +.Pp +This option can be specified multiple times, and the parameters +accumulate. +.It Cm MergeChanges +The parameters following this keyword are regular expressions; +updates to paths which start with a string matching one of +these regular expressions will be merged with local modifications. .Pp This option can be specified multiple times, and the parameters accumulate. @@ -138,6 +146,24 @@ .Cm freebsd-update should keep existing file ownership, permissions, and flags when installing updates if these have been modified locally. +.It Cm StrictComponents +The single parameter following this keyword must be +.Dq yes +or +.Dq no +and specifies whether +.Cm freebsd-update +should interpret the list of components of +.Fx +specified via the +.Cm Components +option strictly as a list of components installed which +should be upgraded when the +.Cm upgrade +command is used ("yes"), or merely as a list of components +which might be installed, of which +.Cm freebsd-update +should identify which in fact are present ("no"). .El .Sh FILES .Bl -tag -width "/etc/freebsd-update.conf" ==== //depot/projects/dtrace/src/share/man/man9/Makefile#20 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.315 2007/11/10 16:47:38 rwatson Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.316 2007/11/13 20:26:27 ru Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -925,6 +925,14 @@ rman.9 rman_set_bustag.9 \ rman.9 rman_set_rid.9 \ rman.9 rman_set_virtual.9 +MLINKS+=rmlock.9 rm_destroy.9 \ + rmlock.9 rm_init.9 \ + rmlock.9 rm_rlock.9 \ + rmlock.9 rm_runlock.9 \ + rmlock.9 RM_SYSINIT.9 \ + rmlock.9 rm_wlock.9 \ + rmlock.9 rm_wowned.9 \ + rmlock.9 rm_wunlock.9 MLINKS+=rtalloc.9 rtalloc1.9 \ rtalloc.9 rtalloc_ign.9 \ rtalloc.9 RTFREE.9 \ @@ -933,14 +941,6 @@ runqueue.9 procrunnable.9 \ runqueue.9 remrunqueue.9 \ runqueue.9 setrunqueue.9 -MLINKS+=rmlock.9 rm_destroy.9 \ - rmlock.9 rm_init.9 \ - rmlock.9 rm_rlock.9 \ - rmlock.9 rm_runlock.9 \ - rmlock.9 RM_SYSINIT.9 \ - rmlock.9 rm_wlock.9 \ - rmlock.9 rm_wowned.9 \ - rmlock.9 rm_wunlock.9 MLINKS+=rwlock.9 rw_assert.9 \ rwlock.9 rw_destroy.9 \ rwlock.9 rw_downgrade.9 \ ==== //depot/projects/dtrace/src/sys/boot/i386/libi386/biosdisk.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.53 2007/10/25 16:53:35 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.54 2007/11/12 23:53:43 bz Exp $"); /* * BIOS disk device handling. @@ -254,7 +254,7 @@ ((v86.ebx & 0xffff) == 0xaa55) && /* signature */ (v86.ecx & 0x1)) { /* packets mode ok */ bd->bd_flags |= BD_MODEEDD1; - if((v86.eax & 0xff00) > 0x300) + if((v86.eax & 0xff00) >= 0x3000) bd->bd_flags |= BD_MODEEDD3; } return(1); ==== //depot/projects/dtrace/src/sys/conf/files#51 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1250 2007/11/08 14:47:54 ups Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1251 2007/11/12 21:51:36 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -423,6 +423,8 @@ dev/advansys/adwcam.c optional adw dev/advansys/adwlib.c optional adw dev/advansys/adwmcode.c optional adw +dev/agp/agp.c optional agp pci +dev/agp/agp_if.m optional agp pci dev/aha/aha.c optional aha dev/aha/aha_isa.c optional aha isa dev/aha/aha_mca.c optional aha mca @@ -2003,8 +2005,6 @@ opencrypto/rmd160.c optional crypto | ipsec opencrypto/skipjack.c optional crypto opencrypto/xform.c optional crypto -pci/agp.c optional agp pci -pci/agp_if.m optional agp pci pci/alpm.c optional alpm pci pci/amdpm.c optional amdpm pci | nfpm pci pci/amdsmb.c optional amdsmb pci ==== //depot/projects/dtrace/src/sys/conf/files.amd64#22 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.113 2007/11/08 22:09:36 benjsc Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.114 2007/11/12 21:51:36 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -138,6 +138,9 @@ crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/acpica/acpi_if.m standard +dev/agp/agp_amd64.c optional agp +dev/agp/agp_i810.c optional agp +dev/agp/agp_intel.c optional agp dev/arcmsr/arcmsr.c optional arcmsr pci dev/asmc/asmc.c optional asmc isa dev/atkbdc/atkbd.c optional atkbd atkbdc @@ -205,9 +208,6 @@ isa/syscons_isa.c optional sc isa/vga_isa.c optional vga kern/link_elf_obj.c standard -pci/agp_amd64.c optional agp -pci/agp_i810.c optional agp -pci/agp_intel.c optional agp # # IA32 binary support # ==== //depot/projects/dtrace/src/sys/conf/files.i386#26 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.586 2007/11/08 22:09:36 benjsc Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.587 2007/11/12 21:51:36 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -141,6 +141,15 @@ crypto/via/padlock_cipher.c optional padlock crypto/via/padlock_hash.c optional padlock dev/advansys/adv_isa.c optional adv isa +dev/agp/agp_ali.c optional agp +dev/agp/agp_amd.c optional agp +dev/agp/agp_amd64.c optional agp +dev/agp/agp_ati.c optional agp +dev/agp/agp_i810.c optional agp +dev/agp/agp_intel.c optional agp +dev/agp/agp_nvidia.c optional agp +dev/agp/agp_sis.c optional agp +dev/agp/agp_via.c optional agp dev/aic/aic_isa.c optional aic isa dev/arcmsr/arcmsr.c optional arcmsr pci dev/ar/if_ar.c optional ar @@ -447,15 +456,6 @@ libkern/ucmpdi2.c standard libkern/udivdi3.c standard libkern/umoddi3.c standard -pci/agp_ali.c optional agp -pci/agp_amd.c optional agp -pci/agp_amd64.c optional agp -pci/agp_ati.c optional agp -pci/agp_i810.c optional agp -pci/agp_intel.c optional agp -pci/agp_nvidia.c optional agp -pci/agp_sis.c optional agp -pci/agp_via.c optional agp i386/xbox/xbox.c optional xbox i386/xbox/xboxfb.c optional xboxfb dev/fb/boot_font.c optional xboxfb ==== //depot/projects/dtrace/src/sys/conf/files.pc98#16 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.357 2007/10/26 13:32:01 nyan Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.358 2007/11/12 21:51:36 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -98,6 +98,13 @@ compile-with "${CC} -c -I$S/crypto/blowfish/arch/i386 ${ASM_CFLAGS} ${WERROR} ${.IMPSRC}" \ no-implicit-rule crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb +dev/agp/agp_ali.c optional agp +dev/agp/agp_amd.c optional agp +dev/agp/agp_i810.c optional agp +dev/agp/agp_intel.c optional agp +dev/agp/agp_nvidia.c optional agp +dev/agp/agp_sis.c optional agp +dev/agp/agp_via.c optional agp dev/aic/aic_cbus.c optional aic isa dev/ar/if_ar.c optional ar dev/ar/if_ar_pci.c optional ar pci @@ -340,10 +347,3 @@ pc98/pc98/canbus_if.m optional canbus pc98/pc98/machdep.c standard pc98/pc98/pc98_machdep.c standard -pci/agp_ali.c optional agp -pci/agp_amd.c optional agp -pci/agp_i810.c optional agp -pci/agp_intel.c optional agp -pci/agp_nvidia.c optional agp -pci/agp_sis.c optional agp -pci/agp_via.c optional agp ==== //depot/projects/dtrace/src/sys/conf/kmod.mk#10 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.219 2007/07/11 01:20:37 marcel Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.220 2007/11/12 21:51:36 jhb Exp $ # # The include file <bsd.kmod.mk> handles building and installing loadable # kernel modules. @@ -321,7 +321,7 @@ .endfor .endif -MFILES?= dev/acpica/acpi_if.m dev/ata/ata_if.m dev/eisa/eisa_if.m \ +MFILES?= dev/acpica/acpi_if.m dev/agp/agp_if.m dev/ata/ata_if.m dev/eisa/eisa_if.m \ dev/iicbus/iicbb_if.m dev/iicbus/iicbus_if.m \ dev/mmc/mmcbr_if.m dev/mmc/mmcbus_if.m \ dev/mii/miibus_if.m dev/ofw/ofw_bus_if.m \ @@ -333,7 +333,7 @@ dev/sound/midi/synth_if.m dev/usb/usb_if.m isa/isa_if.m \ kern/bus_if.m kern/cpufreq_if.m kern/device_if.m kern/serdev_if.m \ libkern/iconv_converter_if.m opencrypto/cryptodev_if.m \ - pc98/pc98/canbus_if.m pci/agp_if.m + pc98/pc98/canbus_if.m .for _srcsrc in ${MFILES} .for _ext in c h ==== //depot/projects/dtrace/src/sys/dev/drm/drmP.h#7 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/drm/drmP.h,v 1.18 2006/11/06 13:41:53 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drmP.h,v 1.19 2007/11/12 21:51:37 jhb Exp $"); #ifndef _DRM_P_H_ #define _DRM_P_H_ @@ -77,7 +77,11 @@ #if defined(__FreeBSD__) #include <sys/rman.h> #include <sys/memrange.h> +#if __FreeBSD_version >= 800004 +#include <dev/agp/agpvar.h> +#else #include <pci/agpvar.h> +#endif #include <sys/agpio.h> #if __FreeBSD_version >= 500000 #include <sys/mutex.h> ==== //depot/projects/dtrace/src/sys/dev/drm/drm_agpsupport.c#6 (text+ko) ==== @@ -32,12 +32,16 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/drm/drm_agpsupport.c,v 1.6 2006/12/28 21:55:47 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/drm/drm_agpsupport.c,v 1.7 2007/11/12 21:51:37 jhb Exp $"); #include "dev/drm/drmP.h" #ifdef __FreeBSD__ +#if __FreeBSD_version >= 800004 +#include <dev/agp/agpreg.h> +#else #include <pci/agpreg.h> +#endif #include <dev/pci/pcireg.h> #endif ==== //depot/projects/dtrace/src/sys/dev/re/if_re.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.95 2007/08/14 02:00:04 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.96 2007/11/12 15:44:00 remko Exp $"); /* * RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver @@ -172,6 +172,8 @@ static struct rl_type re_devs[] = { { DLINK_VENDORID, DLINK_DEVICEID_528T, RL_HWREV_8169S, "D-Link DGE-528(T) Gigabit Ethernet Adapter" }, + { DLINK_VENDORID, DLINK_DEVICEID_528T, RL_HWREV_8169_8110SB, + "D-Link DGE-528(T) Rev.B1 Gigabit Ethernet Adapter" }, { RT_VENDORID, RT_DEVICEID_8139, RL_HWREV_8139CPLUS, "RealTek 8139C+ 10/100BaseTX" }, { RT_VENDORID, RT_DEVICEID_8101E, RL_HWREV_8101E, ==== //depot/projects/dtrace/src/sys/dev/wpi/if_wpi.c#3 (text+ko) ==== @@ -19,7 +19,7 @@ #define VERSION "20071102" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.2 2007/11/08 21:57:08 benjsc Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/wpi/if_wpi.c,v 1.3 2007/11/13 16:12:59 rink Exp $"); /* * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters. @@ -663,8 +663,7 @@ /* set device capabilities */ ic->ic_caps = - IEEE80211_C_WEP /* s/w WEP */ - | IEEE80211_C_MONITOR /* monitor mode supported */ + IEEE80211_C_MONITOR /* monitor mode supported */ | IEEE80211_C_TXPMGT /* tx power management */ | IEEE80211_C_SHSLOT /* short slot time supported */ | IEEE80211_C_SHPREAMBLE /* short preamble supported */ ==== //depot/projects/dtrace/src/sys/fs/ntfs/ntfs_ihash.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * @(#)ufs_ihash.c 8.7 (Berkeley) 5/17/95 - * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.c,v 1.22 2005/10/31 15:41:20 rwatson Exp $ + * $FreeBSD: src/sys/fs/ntfs/ntfs_ihash.c,v 1.23 2007/11/13 19:34:06 maxim Exp $ */ #include <sys/param.h> @@ -73,6 +73,7 @@ void ntfs_nthashdestroy(void) { + hashdestroy(ntfs_nthashtbl, M_NTFSNTHASH, ntfs_nthash); lockdestroy(&ntfs_hashlock); mtx_destroy(&ntfs_nthash_mtx); } ==== //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vfsops.c#3 (text+ko) ==== @@ -48,7 +48,7 @@ * allocate and release resources. */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.11 2007/10/04 17:11:48 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_vfsops.c,v 1.12 2007/11/12 18:57:33 delphij Exp $"); #include <sys/param.h> #include <sys/limits.h> @@ -231,7 +231,7 @@ vfs_scanopt(mp->mnt_optnew, "uid", "%d", &root_uid) != 1) root_uid = va.va_uid; if (mp->mnt_cred->cr_ruid != 0 || - vfs_scanopt(mp->mnt_optnew, "mode", "%o", &root_mode) != 1) + vfs_scanopt(mp->mnt_optnew, "mode", "%ho", &root_mode) != 1) root_mode = va.va_mode; if(vfs_scanopt(mp->mnt_optnew, "inodes", "%d", &nodes_max) != 1) nodes_max = 0; ==== //depot/projects/dtrace/src/sys/i386/i386/locore.s#6 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * from: @(#)locore.s 7.3 (Berkeley) 5/13/91 - * $FreeBSD: src/sys/i386/i386/locore.s,v 1.188 2007/03/24 19:53:22 alc Exp $ + * $FreeBSD: src/sys/i386/i386/locore.s,v 1.189 2007/11/13 23:00:24 peter Exp $ * * originally from: locore.s, by William F. Jolitz * @@ -72,17 +72,7 @@ .set PTD,PTmap + (PTDPTDI * PAGE_SIZE) .set PTDpde,PTD + (PTDPTDI * PDESIZE) -#ifdef SMP /* - * Define layout of per-cpu address space. - * This is "constructed" in locore.s on the BSP and in mp_machdep.c - * for each AP. DO NOT REORDER THESE WITHOUT UPDATING THE REST! - */ - .globl SMP_prvspace - .set SMP_prvspace,(MPPTDI << PDRSHIFT) -#endif /* SMP */ - -/* * Compiled KERNBASE location and the kernel load address */ .globl kernbase @@ -106,16 +96,6 @@ KERNend: .long 0 /* phys addr end of kernel (just after bss) */ physfree: .long 0 /* phys addr of next free page */ -#ifdef SMP - .globl cpu0prvpage -cpu0pp: .long 0 /* phys addr cpu0 private pg */ -cpu0prvpage: .long 0 /* relocated version */ - - .globl SMPpt -SMPptpa: .long 0 /* phys addr SMP page table */ -SMPpt: .long 0 /* relocated version */ -#endif /* SMP */ - .globl IdlePTD IdlePTD: .long 0 /* phys addr of kernel PTD */ @@ -763,20 +743,6 @@ addl $KERNBASE, %esi movl %esi, R(vm86paddr) -#ifdef SMP -/* Allocate cpu0's private data page */ - ALLOCPAGES(1) - movl %esi,R(cpu0pp) - addl $KERNBASE, %esi - movl %esi, R(cpu0prvpage) /* relocated to KVM space */ - -/* Allocate SMP page table page */ - ALLOCPAGES(1) - movl %esi,R(SMPptpa) - addl $KERNBASE, %esi - movl %esi, R(SMPpt) /* relocated to KVM space */ -#endif /* SMP */ - /* * Enable PSE and PGE. */ @@ -854,37 +820,6 @@ movl $ISA_HOLE_LENGTH>>PAGE_SHIFT, %ecx fillkpt(R(vm86pa), $PG_RW|PG_U) -#ifdef SMP -/* Map cpu0's private page into global kmem (4K @ cpu0prvpage) */ - movl R(cpu0pp), %eax - movl $1, %ecx - fillkptphys($PG_RW) - -/* Map SMP page table page into global kmem FWIW */ - movl R(SMPptpa), %eax - movl $1, %ecx - fillkptphys($PG_RW) - -/* Map the private page into the SMP page table */ - movl R(cpu0pp), %eax - movl $0, %ebx /* pte offset = 0 */ - movl $1, %ecx /* one private page coming right up */ - fillkpt(R(SMPptpa), $PG_RW) - -/* ... and put the page table table in the pde. */ - movl R(SMPptpa), %eax - movl $MPPTDI, %ebx - movl $1, %ecx - fillkpt(R(IdlePTD), $PG_RW) - -/* Fakeup VA for the local apic to allow early traps. */ - ALLOCPAGES(1) - movl %esi, %eax - movl $(NPTEPG-1), %ebx /* pte offset = NTEPG-1 */ - movl $1, %ecx /* one private pt coming right up */ - fillkpt(R(SMPptpa), $PG_RW) -#endif /* SMP */ - /* * Create an identity mapping for low physical memory, including the kernel. * The part of this mapping that covers the first 1 MB of physical memory ==== //depot/projects/dtrace/src/sys/i386/i386/machdep.c#21 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.660 2007/11/05 11:36:11 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.661 2007/11/13 23:00:24 peter Exp $"); #include "opt_apic.h" #include "opt_atalk.h" @@ -127,7 +127,6 @@ #include <machine/perfmon.h> #endif #ifdef SMP -#include <machine/privatespace.h> #include <machine/smp.h> #endif @@ -207,9 +206,7 @@ struct kva_md_info kmi; static struct trapframe proc0_tf; -#ifndef SMP -static struct pcpu __pcpu; -#endif +struct pcpu __pcpu[MAXCPU]; struct mtx icu_lock; @@ -2116,11 +2113,7 @@ gdt_segs[GUFS_SEL].ssd_limit = atop(0 - 1); gdt_segs[GUGS_SEL].ssd_limit = atop(0 - 1); -#ifdef SMP - pc = &SMP_prvspace[0].pcpu; -#else - pc = &__pcpu; -#endif + pc = &__pcpu[0]; gdt_segs[GPRIV_SEL].ssd_limit = atop(0 - 1); gdt_segs[GPRIV_SEL].ssd_base = (int) pc; gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pc_common_tss; ==== //depot/projects/dtrace/src/sys/i386/i386/mp_machdep.c#11 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.281 2007/08/02 21:17:57 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.282 2007/11/13 23:00:24 peter Exp $"); #include "opt_apic.h" #include "opt_cpu.h" @@ -78,7 +78,6 @@ #include <machine/psl.h> #include <machine/smp.h> #include <machine/specialreg.h> -#include <machine/privatespace.h> #define WARMBOOT_TARGET 0 #define WARMBOOT_OFF (KERNBASE + 0x0467) @@ -134,6 +133,8 @@ int boot_cpu_id = -1; /* designated BSP */ extern int nkpt; +extern struct pcpu __pcpu[]; + /* * CPU topology map datastructures for HTT. */ @@ -144,12 +145,12 @@ char *bootSTK; static int bootAP; +/* Free these after use */ +void *bootstacks[MAXCPU]; + /* Hotwire a 0->4MB V==P mapping */ extern pt_entry_t *KPTphys; -/* SMP page table page */ -extern pt_entry_t *SMPpt; - struct pcb stoppcbs[MAXCPU]; /* Variables needed for SMP tlb shootdown. */ @@ -493,6 +494,7 @@ void init_secondary(void) { + struct pcpu *pc; vm_offset_t addr; int gsel_tss; int x, myid; @@ -500,11 +502,18 @@ /* bootAP is set in start_ap() to our ID. */ myid = bootAP; - gdt_segs[GPRIV_SEL].ssd_base = (int) &SMP_prvspace[myid]; - gdt_segs[GPROC0_SEL].ssd_base = - (int) &SMP_prvspace[myid].pcpu.pc_common_tss; - SMP_prvspace[myid].pcpu.pc_prvspace = - &SMP_prvspace[myid].pcpu; + + /* Get per-cpu data */ + pc = &__pcpu[myid]; + + /* prime data page for it to use */ + pcpu_init(pc, myid, sizeof(struct pcpu)); + pc->pc_apic_id = cpu_apic_ids[myid]; + pc->pc_prvspace = pc; + pc->pc_curthread = 0; + + gdt_segs[GPRIV_SEL].ssd_base = (int) pc; + gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pc_common_tss; for (x = 0; x < NGDT; x++) { ssdtosd(&gdt_segs[x], &gdt[myid * NGDT + x].sd); @@ -587,7 +596,6 @@ printf("SMP: cpuid = %d\n", PCPU_GET(cpuid)); printf("SMP: actual apic_id = %d\n", lapic_id()); printf("SMP: correct apic_id = %d\n", PCPU_GET(apic_id)); - printf("PTD[MPPTDI] = %#jx\n", (uintmax_t)PTD[MPPTDI]); panic("cpuid mismatch! boom!!"); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200711132332.lADNWR81075756>