Date: Mon, 15 Jul 2002 13:13:02 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 14297 for review Message-ID: <200207152013.g6FKD223008702@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14297 Change 14297 by peter@peter_xeon on 2002/07/15 13:12:37 IFC @14296 Affected files ... .. //depot/projects/pmap/sys/alpha/alpha/pmap.c#7 integrate .. //depot/projects/pmap/sys/alpha/conf/GENERIC#5 integrate .. //depot/projects/pmap/sys/alpha/conf/Makefile#1 branch .. //depot/projects/pmap/sys/alpha/conf/NOTES#1 branch .. //depot/projects/pmap/sys/alpha/conf/SIMOS#3 integrate .. //depot/projects/pmap/sys/boot/common/loader.8#5 integrate .. //depot/projects/pmap/sys/boot/forth/loader.4th.8#3 integrate .. //depot/projects/pmap/sys/boot/i386/pxeldr/pxeboot.8#2 integrate .. //depot/projects/pmap/sys/conf/NOTES#5 integrate .. //depot/projects/pmap/sys/conf/files#11 integrate .. //depot/projects/pmap/sys/conf/files.alpha#6 integrate .. //depot/projects/pmap/sys/conf/files.i386#9 integrate .. //depot/projects/pmap/sys/conf/files.ia64#5 integrate .. //depot/projects/pmap/sys/conf/files.pc98#8 integrate .. //depot/projects/pmap/sys/conf/files.sparc64#6 integrate .. //depot/projects/pmap/sys/conf/files.x86_64#2 integrate .. //depot/projects/pmap/sys/conf/kern.post.mk#9 integrate .. //depot/projects/pmap/sys/conf/kern.pre.mk#10 integrate .. //depot/projects/pmap/sys/conf/makeLINT.sed#1 branch .. //depot/projects/pmap/sys/conf/options#7 integrate .. //depot/projects/pmap/sys/conf/options.alpha#4 integrate .. //depot/projects/pmap/sys/conf/options.i386#10 integrate .. //depot/projects/pmap/sys/conf/options.ia64#3 integrate .. //depot/projects/pmap/sys/conf/options.pc98#10 integrate .. //depot/projects/pmap/sys/crypto/sha2/sha2.c#3 integrate .. //depot/projects/pmap/sys/dev/hme/if_hme.c#3 integrate .. //depot/projects/pmap/sys/dev/hme/if_hmereg.h#3 integrate .. //depot/projects/pmap/sys/dev/random/hash.c#3 integrate .. //depot/projects/pmap/sys/dev/random/hash.h#3 integrate .. //depot/projects/pmap/sys/dev/random/yarrow.c#5 integrate .. //depot/projects/pmap/sys/dev/sbni/if_sbni_isa.c#3 integrate .. //depot/projects/pmap/sys/dev/sbni/if_sbni_pci.c#2 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/pmap/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/pmap/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/pmap/sys/dev/usb/if_kuereg.h#3 integrate .. //depot/projects/pmap/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/pmap/sys/i386/conf/Makefile#3 integrate .. //depot/projects/pmap/sys/i386/conf/NOTES#8 integrate .. //depot/projects/pmap/sys/i386/conf/makeLINT.sed#2 delete .. //depot/projects/pmap/sys/i386/i386/pmap.c#28 integrate .. //depot/projects/pmap/sys/i386/include/bus_at386.h#3 integrate .. //depot/projects/pmap/sys/i386/include/cpufunc.h#13 integrate .. //depot/projects/pmap/sys/i386/include/pcpu.h#3 integrate .. //depot/projects/pmap/sys/i386/isa/prof_machdep.c#2 integrate .. //depot/projects/pmap/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/pmap/sys/kern/init_main.c#9 integrate .. //depot/projects/pmap/sys/kern/kern_exec.c#9 integrate .. //depot/projects/pmap/sys/kern/kern_fork.c#10 integrate .. //depot/projects/pmap/sys/kern/kern_idle.c#4 integrate .. //depot/projects/pmap/sys/kern/kern_proc.c#8 integrate .. //depot/projects/pmap/sys/kern/kern_switch.c#8 integrate .. //depot/projects/pmap/sys/kern/kern_synch.c#7 integrate .. //depot/projects/pmap/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/pmap/sys/kern/kern_tc.c#7 integrate .. //depot/projects/pmap/sys/kern/kern_thread.c#2 integrate .. //depot/projects/pmap/sys/kern/subr_mbuf.c#4 integrate .. //depot/projects/pmap/sys/kern/subr_mchain.c#4 integrate .. //depot/projects/pmap/sys/kern/subr_power.c#3 integrate .. //depot/projects/pmap/sys/kern/subr_witness.c#13 integrate .. //depot/projects/pmap/sys/kern/sysv_msg.c#4 integrate .. //depot/projects/pmap/sys/kern/uipc_mbuf.c#4 integrate .. //depot/projects/pmap/sys/kern/vfs_bio.c#10 integrate .. //depot/projects/pmap/sys/libkern/iconv.c#2 integrate .. //depot/projects/pmap/sys/modules/nfsclient/Makefile#3 integrate .. //depot/projects/pmap/sys/modules/nfsserver/Makefile#3 integrate .. //depot/projects/pmap/sys/modules/random/Makefile#3 integrate .. //depot/projects/pmap/sys/net/if_media.h#3 integrate .. //depot/projects/pmap/sys/netinet/ip_fw.h#3 integrate .. //depot/projects/pmap/sys/netinet/ip_fw2.c#2 integrate .. //depot/projects/pmap/sys/netinet6/udp6_usrreq.c#5 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_lock.c#4 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_lock.h#2 integrate .. //depot/projects/pmap/sys/nfsclient/nfs_socket.c#6 integrate .. //depot/projects/pmap/sys/nfsserver/nfs.h#4 integrate .. //depot/projects/pmap/sys/nfsserver/nfs_srvcache.c#2 integrate .. //depot/projects/pmap/sys/nfsserver/nfs_srvsock.c#5 integrate .. //depot/projects/pmap/sys/nfsserver/nfs_srvsubs.c#6 integrate .. //depot/projects/pmap/sys/nfsserver/nfs_syscalls.c#5 integrate .. //depot/projects/pmap/sys/pc98/i386/machdep.c#7 integrate .. //depot/projects/pmap/sys/pccard/cardinfo.h#3 integrate .. //depot/projects/pmap/sys/pccard/pcic.c#4 integrate .. //depot/projects/pmap/sys/pccard/slot.h#3 integrate .. //depot/projects/pmap/sys/pci/agp.c#3 integrate .. //depot/projects/pmap/sys/pci/agp_i810.c#3 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/mp_machdep.c#5 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/pmap.c#11 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/support.s#4 integrate .. //depot/projects/pmap/sys/sparc64/sparc64/tsb.c#7 integrate .. //depot/projects/pmap/sys/sys/cdefs.h#5 integrate .. //depot/projects/pmap/sys/sys/eventhandler.h#3 integrate .. //depot/projects/pmap/sys/sys/filedesc.h#6 integrate .. //depot/projects/pmap/sys/sys/iconv.h#3 integrate .. //depot/projects/pmap/sys/sys/mbuf.h#4 integrate .. //depot/projects/pmap/sys/sys/param.h#6 integrate .. //depot/projects/pmap/sys/sys/power.h#3 integrate .. //depot/projects/pmap/sys/sys/proc.h#8 integrate .. //depot/projects/pmap/sys/sys/sysctl.h#4 integrate .. //depot/projects/pmap/sys/sys/systm.h#5 integrate .. //depot/projects/pmap/sys/vm/phys_pager.c#3 integrate .. //depot/projects/pmap/sys/vm/vm_contig.c#5 integrate .. //depot/projects/pmap/sys/vm/vm_glue.c#11 integrate .. //depot/projects/pmap/sys/vm/vm_kern.c#5 integrate .. //depot/projects/pmap/sys/vm/vm_page.c#7 integrate .. //depot/projects/pmap/sys/vm/vm_zone.c#4 delete Differences ... ==== //depot/projects/pmap/sys/alpha/alpha/pmap.c#7 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.99 2002/07/13 20:55:21 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.100 2002/07/14 23:51:55 alc Exp $ */ /* @@ -1070,9 +1070,11 @@ m = vm_page_lookup(ksobj, i); m->valid = VM_PAGE_BITS_ALL; } + vm_page_lock_queues(); vm_page_wire(m); vm_page_wakeup(m); vm_page_flag_set(m, PG_MAPPED | PG_WRITEABLE); + vm_page_unlock_queues(); } /* ==== //depot/projects/pmap/sys/alpha/conf/GENERIC#5 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.142 2002/07/13 16:43:53 alfred Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.143 2002/07/15 14:54:36 jhb Exp $ machine alpha cpu EV4 @@ -94,7 +94,6 @@ # SCSI Controllers device ahc # AHA2940 and onboard AIC7xxx devices -#device esp # 53C94 & friends, not CAM-ified device isp # Qlogic family #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') ==== //depot/projects/pmap/sys/alpha/conf/SIMOS#3 (text+ko) ==== @@ -11,29 +11,27 @@ # device lines is present in the ./NOTES file. If you are in doubt as # to the purpose or necessity of a line, check first in NOTES. # -# $FreeBSD: src/sys/alpha/conf/SIMOS,v 1.19 2002/04/03 10:56:54 ru Exp $ +# $FreeBSD: src/sys/alpha/conf/SIMOS,v 1.20 2002/07/15 14:33:20 jhb Exp $ -machine "alpha" -cpu "EV5" -ident GENERIC +machine alpha +cpu EV5 +ident SIMOS maxusers 10 -options "DEC_KN8AE" +options DEC_KN8AE options SIMOS options INET #InterNETworking options FFS #Berkeley Fast Filesystem options NFSCLIENT #Network Filesystem Client options NFSSERVER #Network Filesystem Server options MSDOSFS #MSDOS Filesystem -options "CD9660" #ISO 9660 Filesystem +options CD9660 #ISO 9660 Filesystem options NFS_ROOT #NFS usable as root device options PROCFS #Process filesystem (requires PSEUDOFS) options PSEUDOFS #Pseudo-filesystem framework -options "COMPAT_43" #Compatible with BSD 4.3 [KEEP THIS!] +options COMPAT_43 #Compatible with BSD 4.3 [KEEP THIS!] options SCSI_DELAY=100 #Be pessimistic about Joe SCSI device -config kernel - device pci device simos @@ -43,11 +41,7 @@ device sa device cd -# Order is important here due to intrusive probes, do *not* alphabetize -# this list of network interfaces until the probes have been fixed. -# Right now it appears that the ie0 must be probed before ep0. See -# revision 1.20 of this file. -#device de +#device de device loop device ether ==== //depot/projects/pmap/sys/boot/common/loader.8#5 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.42 2002/05/29 22:57:18 schweikh Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.44 2002/07/15 03:39:34 keramida Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -78,7 +78,7 @@ .Tn FICL is initialized, the builtin words are added to its vocabulary, and .Pa /boot/boot.4th -will be processed if it exists. +is processed if it exists. No disk switching is possible while that file is being read. The inner interpreter .Nm @@ -93,7 +93,7 @@ .Pa /boot/loader.rc is processed if available, and, failing that, .Pa /boot/boot.conf -will be read for historical reasons. +is read for historical reasons. These files are processed through the .Ic include command, which reads all of them into memory before processing them, @@ -114,8 +114,9 @@ .Nm will engage interactive mode. .Sh BUILTIN COMMANDS -.Nm Loader Ns 's -builtin commands take its parameters from the command line. +In +.Nm Ns , +builtin commands take parameters from the command line. Presently, the only way to call them from a script is by using .Pa evaluate @@ -585,7 +586,7 @@ versa. .Pp In -.Nm , +.Nm Ns , each line read interactively is then fed to .Tn FICL , which may call @@ -860,11 +861,13 @@ Search-Order extensions word set. .Ef .Sh HISTORY +The .Nm first appeared in .Fx 3.1 . .Sh AUTHORS .An -nosplit +The .Nm was written by .An Michael Smith Aq msmith@FreeBSD.org . ==== //depot/projects/pmap/sys/boot/forth/loader.4th.8#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/forth/loader.4th.8,v 1.12 2002/05/30 09:24:01 schweikh Exp $ +.\" $FreeBSD: src/sys/boot/forth/loader.4th.8,v 1.13 2002/07/14 15:21:28 charnier Exp $ .\" .Dd April 25, 1999 .Dt LOADER.4TH 8 @@ -53,7 +53,7 @@ for additional commands. .Pp Before using any of the commands provided in -.Nm , +.Nm Ns , it must be included through the command: .Pp @@ -202,12 +202,14 @@ .Xr loader.conf 5 , .Xr loader 8 .Sh HISTORY +The .Nm -first appeared in +set of commands first appeared in .Fx 3.2 . .Sh AUTHORS +The .Nm -was written by +set of commands was written by .An Daniel C. Sobral Aq dcs@FreeBSD.org . .Sh BUGS A British espionage series. ==== //depot/projects/pmap/sys/boot/i386/pxeldr/pxeboot.8#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/i386/pxeldr/pxeboot.8,v 1.5 2000/11/22 09:30:31 ru Exp $ +.\" $FreeBSD: src/sys/boot/i386/pxeldr/pxeboot.8,v 1.6 2002/07/14 15:22:49 charnier Exp $ .\" .\" Note: The date here should be updated whenever a non-trivial .\" change is made to the manual page. @@ -33,15 +33,17 @@ .Nm pxeboot .Nd Preboot Execution Environment (PXE) bootloader .Sh DESCRIPTION +The .Nm -is a modified version of the system third-stage bootstrap +bootloader is a modified version of the system third-stage bootstrap .Xr loader 8 configured to run under Intel's Preboot Execution Environment (PXE) system. PXE is a form of smart boot ROM, built into Intel EtherExpress Pro/100 and 3Com 3c905c Ethernet cards, and Ethernet-equipped Intel motherboards. PXE supports DHCP configuration and provides low-level NIC access services. +The .Nm -retrieves the kernel, modules, +bootloader retrieves the kernel, modules, and other files either via NFS over UDP or by TFTP, selectable through compile-time options. In combination with a memory filesystem image or NFS-mounted root filesystem, @@ -92,8 +94,9 @@ .Pp As PXE is still in its infancy, some firmware versions may not work properly. +The .Nm -has been extensively tested on version 0.99 of Intel firmware; +bootloader has been extensively tested on version 0.99 of Intel firmware; pre-release versions of the newer 2.0 firmware are known to have problems. Check with the device's manufacturer for their latest stable release. @@ -104,13 +107,15 @@ .Sh SEE ALSO .Xr loader 8 .Sh HISTORY +The .Nm -first appeared in +bootloader first appeared in .Fx 4.1 . .Sh AUTHORS .An -nosplit +The .Nm -was written by +bootloader was written by .An John Baldwin Aq jhb@FreeBSD.org and .An Paul Saab Aq ps@FreeBSD.org . ==== //depot/projects/pmap/sys/conf/NOTES#5 (text+ko) ==== @@ -14,7 +14,7 @@ # This file contains machine independent kernel configuration notes. For # machine dependent notes, look in /sys/<arch>/conf/NOTES. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1046 2002/07/13 16:43:53 alfred Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1056 2002/07/15 19:24:50 jhb Exp $ # # @@ -86,7 +86,6 @@ # Options for the VM subsystem options PQ_CACHESIZE=512 # color for 512k/16k cache -options KSTACK_PAGES=3 # number of stack pages per process # Deprecated options supported for backwards compatibility #options PQ_NOOPT # No coloring #options PQ_LARGECACHE # color for 512k/16k cache @@ -100,7 +99,7 @@ # options INCLUDE_CONFIG_FILE # Include this file in kernel -options GEOM # Use the GEOMetry system for +options GEOM # Use the GEOMetry system for # disk-I/O transformations. # @@ -739,6 +738,20 @@ options HZ=100 +# If you see the "calcru: negative time of %ld usec for pid %d (%s)\n" +# message you probably have some broken sw/hw which disables interrupts +# for too long. You can make the system more resistant to this by +# choosing a high value for NTIMECOUNTER. The default is 5, there +# is no upper limit but more than a couple of hundred are not productive. + +options NTIMECOUNTER=20 + +# Enable support for the kernel PLL to use an external PPS signal, +# under supervision of [x]ntpd(8) +# More info in ntpd documentation: http://www.eecis.udel.edu/~ntp + +options PPS_SYNC + ##################################################################### # SCSI DEVICES @@ -932,46 +945,6 @@ ##################################################################### -# HARDWARE BUS CONFIGURATION - -# -# ISA bus -# - -options COMPAT_OLDISA #Use ISA shims and glue for old drivers - -# Enable support for the kernel PLL to use an external PPS signal, -# under supervision of [x]ntpd(8) -# More info in ntpd documentation: http://www.eecis.udel.edu/~ntp - -options PPS_SYNC - -# If you see the "calcru: negative time of %ld usec for pid %d (%s)\n" -# message you probably have some broken sw/hw which disables interrupts -# for too long. You can make the system more resistant to this by -# choosing a high value for NTIMECOUNTER. The default is 5, there -# is no upper limit but more than a couple of hundred are not productive. - -options NTIMECOUNTER=20 - -# -# EISA bus -# - -# By default, only 10 EISA slots are probed, since the slot numbers -# above clash with the configuration address space of the PCI subsystem, -# and the EISA probe is not very smart about this. This is sufficient -# for most machines, but in particular the HP NetServer LC series comes -# with an onboard AIC7770 dual-channel SCSI controller on EISA slot #11, -# thus you need to bump this figure to 12 for them. -options EISA_SLOTS=12 - -# -# PCI bus & PCI options: -# - - -##################################################################### # HARDWARE DEVICE CONFIGURATION # For ISA the required hints are listed. @@ -1017,7 +990,7 @@ #for some laptops options PSM_RESETAFTERSUSPEND #reset the device at the resume event -# The video card driver. +# Video card driver for VGA adapters. device vga hint.vga.0.at="isa" @@ -1096,21 +1069,6 @@ # 0x100 Probe for a keyboard device periodically if one is not present # -# ACPI support using the Intel ACPI Component Architecture reference -# implementation. -# -# ACPI_DEBUG enables the use of the debug.acpi.level and debug.acpi.layer -# kernel environment variables to select initial debugging levels for the -# Intel ACPICA code. (Note that the Intel code must also have USE_DEBUGGER -# defined when it is built). -# -# Note that building ACPI into the kernel is deprecated; the module is -# normally loaded automatically by the loader. -# -device acpica -options ACPI_DEBUG - -# # Optional devices: # @@ -1810,6 +1768,11 @@ # si: Specialix SI/XIO 4-32 port terminal multiplexor # nmdm: nullmodem terminal driver (see nmdm(4)) +# Notes on the Digiboard PC/Xi and PC/Xe series driver +# +# The NDGBPORTS option specifies the number of ports controlled by the +# dgb(4) driver. The default value is 16 ports per device. + # Notes on the Digiboard driver: # # The following flag values have special meanings in dgb: @@ -1857,7 +1820,7 @@ hint.cy.0.maddr="0xd4000" hint.cy.0.msize="0x2000" device dgb 1 -options NDGBPORTS=16 # Defaults to 16*NDGB +options NDGBPORTS=17 hint.dgb.0.at="isa" hint.dgb.0.port="0x220" hint.dgb.0.maddr="0xfc000" @@ -2316,8 +2279,6 @@ options NDEVFSINO=1025 options NDEVFSOVERFLOW=32769 options NETGRAPH_BRIDGE -# SIMOS is broken since it is alpha-only but not ifdefed. -##options SIMOS # Yet more undocumented options for linting. options VGA_DEBUG ==== //depot/projects/pmap/sys/conf/files#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.660 2002/07/11 03:26:39 mjacob Exp $ +# $FreeBSD: src/sys/conf/files,v 1.664 2002/07/15 19:11:20 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -501,12 +501,15 @@ dev/ppbus/pps.c optional pps dev/ppbus/vpo.c optional vpo dev/ppbus/vpoio.c optional vpo +dev/puc/puc.c optional puc pci +dev/puc/pucdata.c optional puc pci dev/random/harvest.c standard dev/random/randomdev.c optional random dev/random/yarrow.c optional random dev/random/hash.c optional random crypto/rijndael/rijndael-alg-fst.c optional random crypto/rijndael/rijndael-api-fst.c optional random +crypto/sha2/sha2.c optional random dev/ray/if_ray.c optional ray card dev/ray/if_ray.c optional ray pccard dev/rp/rp.c optional rp @@ -519,6 +522,11 @@ dev/si/si_eisa.c optional si eisa dev/si/si_isa.c optional si isa dev/si/si_pci.c optional si pci +dev/sio/sio_isa.c optional sio isa +dev/sio/sio_pccard.c optional sio card +dev/sio/sio_pccard.c optional sio pccard +dev/sio/sio_pci.c optional sio pci +dev/sio/sio_puc.c optional sio puc pci dev/smbus/smbus_if.m optional smbus dev/smbus/smb.c optional smb dev/smbus/smbconf.c optional smbus @@ -718,6 +726,12 @@ fs/pseudofs/pseudofs_fileno.c optional pseudofs fs/pseudofs/pseudofs_vncache.c optional pseudofs fs/pseudofs/pseudofs_vnops.c optional pseudofs +fs/smbfs/smbfs_io.c optional smbfs +fs/smbfs/smbfs_node.c optional smbfs +fs/smbfs/smbfs_smb.c optional smbfs +fs/smbfs/smbfs_subr.c optional smbfs +fs/smbfs/smbfs_vfsops.c optional smbfs +fs/smbfs/smbfs_vnops.c optional smbfs fs/specfs/spec_vnops.c standard fs/udf/udf_vfsops.c optional udf fs/udf/udf_vnops.c optional udf ==== //depot/projects/pmap/sys/conf/files.alpha#6 (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.alpha,v 1.87 2002/07/09 19:20:18 obrien Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.90 2002/07/15 15:47:34 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -69,9 +69,6 @@ # alpha/alpha/locore.s standard alpha/alpha/machdep.c standard alpha/alpha/mem.c standard -alpha/alpha/mountroot.c optional slice -alpha/alpha/perfmon.c optional perfmon profiling-routine -alpha/alpha/perfmon.c optional perfmon alpha/alpha/pmap.c standard alpha/alpha/mp_machdep.c optional smp alpha/alpha/prom.c standard @@ -177,9 +174,6 @@ dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd dev/sio/sio.c optional sio -dev/sio/sio_isa.c optional sio isa -#dev/sio/sio_pccard.c optional sio pccard -dev/sio/sio_pci.c optional sio pci dev/syscons/schistory.c count sc dev/syscons/scmouse.c optional sc dev/syscons/scterm.c optional sc ==== //depot/projects/pmap/sys/conf/files.i386#9 (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.402 2002/06/13 06:04:25 brooks Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.405 2002/07/15 19:11:21 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -120,17 +120,10 @@ dev/kbd/kbd.c optional ukbd dev/kbd/kbd.c optional vt dev/lnc/if_lnc_isa.c optional lnc isa -dev/puc/puc.c optional puc -dev/puc/pucdata.c optional puc dev/sbni/if_sbni.c optional sbni dev/sbni/if_sbni_isa.c optional sbni isa dev/sbni/if_sbni_pci.c optional sbni pci dev/sio/sio.c optional sio -dev/sio/sio_isa.c optional sio isa -dev/sio/sio_pccard.c optional sio card -dev/sio/sio_pccard.c optional sio pccard -dev/sio/sio_pci.c optional sio pci -dev/sio/sio_puc.c optional sio puc dev/sr/if_sr_isa.c optional sr isa dev/syscons/apm/apm_saver.c optional apm_saver apm dev/syscons/schistory.c count sc @@ -144,12 +137,6 @@ dev/syscons/scvtb.c optional sc dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc -fs/smbfs/smbfs_io.c optional smbfs -fs/smbfs/smbfs_node.c optional smbfs -fs/smbfs/smbfs_smb.c optional smbfs -fs/smbfs/smbfs_subr.c optional smbfs -fs/smbfs/smbfs_vfsops.c optional smbfs -fs/smbfs/smbfs_vnops.c optional smbfs gnu/i386/fpemul/div_small.s optional gpl_math_emulate \ warning "kernel contains GPL contaminated math emulator" gnu/i386/fpemul/errors.c optional gpl_math_emulate ==== //depot/projects/pmap/sys/conf/files.ia64#5 (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.ia64,v 1.32 2002/05/13 02:40:21 jake Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.33 2002/07/15 15:47:34 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -85,9 +85,6 @@ dev/kbd/kbd.c optional sc dev/kbd/kbd.c optional ukbd dev/sio/sio.c optional sio -dev/sio/sio_isa.c optional sio isa -#dev/sio/sio_pccard.c optional sio pccard -dev/sio/sio_pci.c optional sio pci dev/syscons/schistory.c count sc dev/syscons/scmouse.c optional sc dev/syscons/scterm.c optional sc ==== //depot/projects/pmap/sys/conf/files.pc98#8 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.234 2002/06/13 06:04:25 brooks Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.237 2002/07/15 19:11:21 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -114,15 +114,9 @@ dev/kbd/kbd.c optional ukbd dev/kbd/kbd.c count pckbd dev/lnc/if_lnc_cbus.c optional lnc isa -dev/puc/puc.c optional puc -dev/puc/pucdata.c optional puc dev/sbni/if_sbni.c optional sbni dev/sbni/if_sbni_isa.c optional sbni isa dev/sbni/if_sbni_pci.c optional sbni pci -dev/sio/sio_pccard.c optional sio card -dev/sio/sio_pccard.c optional sio pccard -dev/sio/sio_pci.c optional sio pci -dev/sio/sio_puc.c optional sio puc dev/snc/dp83932.c optional snc dev/snc/dp83932subr.c optional snc dev/snc/if_snc.c optional snc @@ -136,12 +130,6 @@ dev/syscons/scterm-dumb.c optional sc dev/syscons/scvidctl.c optional sc dev/syscons/sysmouse.c optional sc -fs/smbfs/smbfs_io.c optional smbfs -fs/smbfs/smbfs_node.c optional smbfs -fs/smbfs/smbfs_smb.c optional smbfs -fs/smbfs/smbfs_subr.c optional smbfs -fs/smbfs/smbfs_vfsops.c optional smbfs -fs/smbfs/smbfs_vnops.c optional smbfs gnu/i386/fpemul/div_small.s optional gpl_math_emulate \ warning "kernel contains GPL contaminated math emulator" gnu/i386/fpemul/errors.c optional gpl_math_emulate ==== //depot/projects/pmap/sys/conf/files.sparc64#6 (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.sparc64,v 1.22 2002/06/18 01:14:54 obrien Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.23 2002/07/15 15:47:34 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -13,11 +13,6 @@ dev/ofw/ofw_console.c optional ofw_console dev/ofw/openfirm.c standard dev/sio/sio.c optional sio -dev/sio/sio_ebus.c optional sio ebus -dev/sio/sio_isa.c optional sio isa -dev/sio/sio_pccard.c optional sio card -dev/sio/sio_pccard.c optional sio pccard -dev/sio/sio_pci.c optional sio pci libkern/ffs.c standard kern/subr_diskmbr.c standard kern/syscalls.c optional ktr ==== //depot/projects/pmap/sys/conf/files.x86_64#2 (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.x86_64,v 1.1 2002/06/30 08:05:21 obrien Exp $ +# $FreeBSD: src/sys/conf/files.x86_64,v 1.3 2002/07/15 15:47:34 jhb Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -16,11 +16,6 @@ dev/kbd/kbd.c optional ukbd dev/kbd/kbd.c optional vt dev/sio/sio.c optional sio -dev/sio/sio_isa.c optional sio isa -dev/sio/sio_pccard.c optional sio card -dev/sio/sio_pccard.c optional sio pccard -dev/sio/sio_pci.c optional sio pci -dev/sio/sio_puc.c optional sio puc dev/syscons/apm/apm_saver.c optional apm_saver apm dev/syscons/schistory.c count sc dev/syscons/scmouse.c optional sc ==== //depot/projects/pmap/sys/conf/kern.post.mk#9 (text+ko) ==== @@ -6,7 +6,7 @@ # should be defined in the kern.pre.mk so that port makefiles can # override or augment them. # -# $FreeBSD: src/sys/conf/kern.post.mk,v 1.20 2002/05/23 07:25:01 ru Exp $ +# $FreeBSD: src/sys/conf/kern.post.mk,v 1.21 2002/07/13 22:28:34 bde Exp $ # # XXX why are only some phony targets marked phony? @@ -224,7 +224,7 @@ ${NORMAL_C} vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP} - sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT} + sh $S/conf/newvers.sh ${KERN_IDENT} # XXX strictly, everything depends on Makefile because changes to ${PROF} # only appear there, but we don't handle that. ==== //depot/projects/pmap/sys/conf/kern.pre.mk#10 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kenrels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.14 2002/07/13 19:36:14 bde Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.15 2002/07/13 22:28:34 bde Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -38,7 +38,7 @@ INCLUDES+= -I/usr/include .endif -COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h +COPTS= ${INCLUDES} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -fno-common # XXX LOCORE means "don't declare C stuff" not "for locore.s". @@ -50,18 +50,16 @@ CFLAGS+= ${FMT} .if defined(PROFLEVEL) && ${PROFLEVEL} >= 1 -IDENT= -DGPROF +CFLAGS+= -DGPROF -falign-functions=16 +.if ${PROFLEVEL} >= 2 +CFLAGS+= -DGPROF4 -DGUPROF +# XXX -Wno-inline is to break some warnings. +PROF= -finstrument-functions -Wno-inline +.else PROF= -pg .endif - +.endif DEFINED_PROF= ${PROF} -.if defined(PROF) -CFLAGS+= -falign-functions=16 -.if ${PROFLEVEL} >= 2 -IDENT+= -DGPROF4 -DGUPROF -PROF+= -mprofiler-epilogue -.endif -.endif .if defined(NO_WERROR) WERROR= ==== //depot/projects/pmap/sys/conf/options#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.331 2002/07/12 06:38:33 alfred Exp $ +# $FreeBSD: src/sys/conf/options,v 1.337 2002/07/15 19:11:21 jhb Exp $ # # On the handling of kernel options # @@ -62,8 +62,6 @@ # mapped I/O # Miscellaneous options. -GEOM opt_geom.h - ADAPTIVE_MUTEXES COMPAT_43 opt_compat.h COMPAT_FREEBSD4 opt_compat.h @@ -76,28 +74,27 @@ DDB_UNATTENDED opt_ddb.h GDB_REMOTE_CHAT opt_ddb.h GDBSPEED opt_ddb.h -NODEVFS opt_devfs.h +GEOM HW_WDOG KTRACE KTRACE_REQUEST_POOL opt_ktrace.h LIBICONV MD_ROOT opt_md.h MD_ROOT_SIZE opt_md.h +NDGBPORTS opt_dgb.h +NODEVFS opt_devfs.h NTIMECOUNTER opt_ntp.h NSWAPDEV opt_swap.h PPS_SYNC opt_ntp.h +PUC_FASTINTR opt_puc.h QUOTA SPX_HACK SUIDDIR opt_suiddir.h -SYSVMSG opt_sysvipc.h -SYSVSEM opt_sysvipc.h -SYSVSHM opt_sysvipc.h -SHMALL opt_sysvipc.h -SHMMAX opt_sysvipc.h -SHMMAXPGS opt_sysvipc.h -SHMMIN opt_sysvipc.h -SHMMNI opt_sysvipc.h -SHMSEG opt_sysvipc.h +MSGMNB opt_sysvipc.h +MSGMNI opt_sysvipc.h +MSGSEG opt_sysvipc.h +MSGSSZ opt_sysvipc.h +MSGTQL opt_sysvipc.h SEMMAP opt_sysvipc.h SEMMNI opt_sysvipc.h SEMMNS opt_sysvipc.h @@ -105,12 +102,18 @@ SEMMSL opt_sysvipc.h SEMOPM opt_sysvipc.h SEMUME opt_sysvipc.h -MSGMNB opt_sysvipc.h -MSGMNI opt_sysvipc.h -MSGSEG opt_sysvipc.h -MSGSSZ opt_sysvipc.h -MSGTQL opt_sysvipc.h +SHMALL opt_sysvipc.h +SHMMAX opt_sysvipc.h +SHMMAXPGS opt_sysvipc.h +SHMMIN opt_sysvipc.h +SHMMNI opt_sysvipc.h +SHMSEG opt_sysvipc.h +SYSVMSG opt_sysvipc.h +SYSVSEM opt_sysvipc.h +SYSVSHM opt_sysvipc.h VFS_AIO +WLCACHE opt_wavelan.h +WLDEBUG opt_wavelan.h # POSIX kernel options P1003_1B opt_posix.h @@ -140,6 +143,7 @@ UMAPFS opt_dontuse.h NTFS opt_dontuse.h HPFS opt_dontuse.h +SMBFS opt_dontuse.h UNIONFS opt_dontuse.h UDF opt_dontuse.h @@ -179,6 +183,10 @@ # they won't make any difference yet). NFS_ROOT opt_nfsroot.h +# SMB/CIFS requester +NETSMB opt_netsmb.h +NETSMBCRYPTO opt_netsmb.h + # Options used only in subr_param.c. HZ opt_param.h MAXFILES opt_param.h ==== //depot/projects/pmap/sys/conf/options.alpha#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.alpha,v 1.36 2002/07/09 19:20:18 obrien Exp $ +# $FreeBSD: src/sys/conf/options.alpha,v 1.37 2002/07/15 18:43:09 jhb Exp $ # Options specific to the Alpha platform kernels EV5 opt_global.h @@ -26,9 +26,11 @@ MAXCONS opt_syscons.h SC_ALT_MOUSE_IMAGE opt_syscons.h +SC_CUT_SPACES2TABS opt_syscons.h +SC_CUT_SEPCHARS opt_syscons.h SC_DEBUG_LEVEL opt_syscons.h SC_DFLT_FONT opt_syscons.h -SC_DISABLE_DDB opt_syscons.h +SC_DISABLE_DDBKEY opt_syscons.h SC_DISABLE_REBOOT opt_syscons.h SC_HISTORY_SIZE opt_syscons.h SC_KERNEL_CONS_ATTR opt_syscons.h ==== //depot/projects/pmap/sys/conf/options.i386#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.172 2002/07/12 07:56:07 peter Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.176 2002/07/15 19:11:21 jhb Exp $ # Options specific to the i386 platform kernels MATH_EMULATE opt_math_emulate.h @@ -16,8 +16,6 @@ AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h I586_PMC_GUPROF opt_i586_guprof.h -WLCACHE opt_wavelan.h -WLDEBUG opt_wavelan.h COMPAT_OLDISA BROKEN_KEYBOARD_RESET opt_reset.h KSTACK_PAGES @@ -107,8 +105,6 @@ PSM_RESETAFTERSUSPEND opt_psm.h PSM_DEBUG opt_psm.h -PUC_FASTINTR opt_puc.h - ATKBD_DFLT_KEYMAP opt_atkbd.h KBD_DISABLE_KEYMAP_LOAD opt_kbd.h @@ -173,21 +169,10 @@ IPR_VJ opt_i4b.h IPR_LOG opt_i4b.h -# Total number of ports controlled by the dgb(4) driver. -# Defaults to NDGB*16. -NDGBPORTS opt_dgb.h - # Device options DEV_NPX opt_npx.h DEV_SPLASH opt_splash.h -# SMB/CIFS requester -NETSMB opt_netsmb.h -NETSMBCRYPTO opt_netsmb.h - >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207152013.g6FKD223008702>