PERFORCE change 87444 for review
Olivier Houchard
cognet at FreeBSD.org
Tue Nov 29 17:02:43 GMT 2005
http://perforce.freebsd.org/chv.cgi?CH=87444
Change 87444 by cognet at cognet on 2005/11/29 17:01:42
YA IFC
Affected files ...
.. //depot/projects/arm/src/sys/alpha/conf/DEFAULTS#2 integrate
.. //depot/projects/arm/src/sys/alpha/conf/GENERIC#4 integrate
.. //depot/projects/arm/src/sys/alpha/conf/NOTES#2 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#4 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#3 integrate
.. //depot/projects/arm/src/sys/amd64/conf/DEFAULTS#3 integrate
.. //depot/projects/arm/src/sys/amd64/conf/GENERIC#6 integrate
.. //depot/projects/arm/src/sys/amd64/conf/NOTES#4 integrate
.. //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#3 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.alpha#3 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.amd64#3 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.arm#5 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.i386#3 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.ia64#3 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.pc98#3 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.powerpc#3 integrate
.. //depot/projects/arm/src/sys/conf/Makefile.sparc64#3 integrate
.. //depot/projects/arm/src/sys/conf/NOTES#7 integrate
.. //depot/projects/arm/src/sys/conf/files#7 integrate
.. //depot/projects/arm/src/sys/conf/files.alpha#3 integrate
.. //depot/projects/arm/src/sys/conf/files.amd64#5 integrate
.. //depot/projects/arm/src/sys/conf/files.i386#7 integrate
.. //depot/projects/arm/src/sys/conf/files.ia64#3 integrate
.. //depot/projects/arm/src/sys/conf/files.pc98#3 integrate
.. //depot/projects/arm/src/sys/conf/files.powerpc#4 integrate
.. //depot/projects/arm/src/sys/conf/files.sparc64#4 integrate
.. //depot/projects/arm/src/sys/conf/kmod.mk#3 integrate
.. //depot/projects/arm/src/sys/dev/acpica/acpi_cmbat.c#4 integrate
.. //depot/projects/arm/src/sys/dev/amr/amr.c#5 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-all.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-all.h#3 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-chipset.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-lowlevel.c#5 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-raid.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ata/ata-raid.h#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/ati_pcigart.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm-preprocess.sh#1 branch
.. //depot/projects/arm/src/sys/dev/drm/drm-subprocess.pl#1 branch
.. //depot/projects/arm/src/sys/dev/drm/drm.h#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/drmP.h#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_agpsupport.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_atomic.h#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_auth.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_bufs.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_context.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_dma.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_drawable.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_drv.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_fops.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_ioctl.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_irq.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_linux_list.h#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_lock.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_memory.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_pci.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_pciids.h#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_sarea.h#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_scatter.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_sysctl.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/drm_vm.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/i915_dma.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/i915_drm.h#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/i915_drv.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/i915_drv.h#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/i915_irq.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/i915_mem.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/mach64_dma.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/mach64_drm.h#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/mach64_drv.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/mach64_drv.h#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/mach64_irq.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/mach64_state.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/mga_dma.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/mga_drm.h#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/mga_drv.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/mga_drv.h#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/mga_irq.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/mga_state.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/mga_ucode.h#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/mga_warp.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/r128_cce.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/r128_drm.h#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/r128_drv.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/r128_drv.h#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/r128_irq.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/r128_state.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/r300_cmdbuf.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/r300_reg.h#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/radeon_cp.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/radeon_drm.h#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/radeon_drv.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/radeon_drv.h#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/radeon_irq.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/radeon_mem.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/radeon_state.c#4 integrate
.. //depot/projects/arm/src/sys/dev/drm/savage_bci.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/savage_drm.h#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/savage_drv.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/savage_drv.h#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/savage_state.c#2 integrate
.. //depot/projects/arm/src/sys/dev/drm/sis_drm.h#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/sis_drv.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/sis_drv.h#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/sis_ds.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/sis_ds.h#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/sis_mm.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/tdfx_drv.c#3 integrate
.. //depot/projects/arm/src/sys/dev/drm/tdfx_drv.h#2 integrate
.. //depot/projects/arm/src/sys/dev/em/if_em.c#6 integrate
.. //depot/projects/arm/src/sys/dev/firewire/firewire.c#2 integrate
.. //depot/projects/arm/src/sys/dev/ips/ips.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ips/ips.h#3 integrate
.. //depot/projects/arm/src/sys/dev/ips/ips_commands.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ips/ips_disk.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ips/ips_ioctl.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ips/ips_pci.c#3 integrate
.. //depot/projects/arm/src/sys/dev/ips/ipsreg.h#1 branch
.. //depot/projects/arm/src/sys/dev/sound/driver.c#2 integrate
.. //depot/projects/arm/src/sys/dev/sound/pci/atiixp.c#1 branch
.. //depot/projects/arm/src/sys/dev/sound/pci/atiixp.h#1 branch
.. //depot/projects/arm/src/sys/dev/sound/pcm/ac97.c#3 integrate
.. //depot/projects/arm/src/sys/dev/sound/pcm/feeder_fmt.c#3 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_ural.c#4 integrate
.. //depot/projects/arm/src/sys/dev/usb/if_uralreg.h#2 integrate
.. //depot/projects/arm/src/sys/dev/usb/ohci.c#3 integrate
.. //depot/projects/arm/src/sys/dev/usb/ohcivar.h#3 integrate
.. //depot/projects/arm/src/sys/dev/usb/umass.c#3 integrate
.. //depot/projects/arm/src/sys/geom/geom_kern.c#3 integrate
.. //depot/projects/arm/src/sys/geom/label/g_label_ntfs.c#2 integrate
.. //depot/projects/arm/src/sys/geom/vinum/geom_vinum.c#5 integrate
.. //depot/projects/arm/src/sys/geom/vinum/geom_vinum_drive.c#5 integrate
.. //depot/projects/arm/src/sys/i386/conf/DEFAULTS#3 integrate
.. //depot/projects/arm/src/sys/i386/conf/GENERIC#5 integrate
.. //depot/projects/arm/src/sys/i386/conf/NOTES#6 integrate
.. //depot/projects/arm/src/sys/i386/conf/XBOX#2 integrate
.. //depot/projects/arm/src/sys/i386/i386/busdma_machdep.c#4 integrate
.. //depot/projects/arm/src/sys/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/arm/src/sys/ia64/conf/DEFAULTS#2 integrate
.. //depot/projects/arm/src/sys/ia64/conf/GENERIC#4 integrate
.. //depot/projects/arm/src/sys/ia64/conf/NOTES#3 integrate
.. //depot/projects/arm/src/sys/ia64/conf/SKI#2 integrate
.. //depot/projects/arm/src/sys/kern/init_sysent.c#4 integrate
.. //depot/projects/arm/src/sys/kern/kern_synch.c#3 integrate
.. //depot/projects/arm/src/sys/kern/kern_time.c#4 integrate
.. //depot/projects/arm/src/sys/kern/syscalls.c#4 integrate
.. //depot/projects/arm/src/sys/kern/syscalls.master#5 integrate
.. //depot/projects/arm/src/sys/kern/uipc_mqueue.c#1 branch
.. //depot/projects/arm/src/sys/kern/uipc_socket.c#5 integrate
.. //depot/projects/arm/src/sys/modules/Makefile#5 integrate
.. //depot/projects/arm/src/sys/modules/drm/Makefile#3 integrate
.. //depot/projects/arm/src/sys/modules/drm/i915/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/drm/savage/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/geom/geom_vinum/Makefile#4 integrate
.. //depot/projects/arm/src/sys/modules/mqueue/Makefile#1 branch
.. //depot/projects/arm/src/sys/modules/sound/driver/Makefile#3 integrate
.. //depot/projects/arm/src/sys/modules/sound/driver/atiixp/Makefile#1 branch
.. //depot/projects/arm/src/sys/net/if_clone.c#4 integrate
.. //depot/projects/arm/src/sys/net/if_vlan.c#4 integrate
.. //depot/projects/arm/src/sys/netgraph/netflow/netflow.c#4 integrate
.. //depot/projects/arm/src/sys/netinet/ip_dummynet.c#4 integrate
.. //depot/projects/arm/src/sys/netinet/ip_dummynet.h#3 integrate
.. //depot/projects/arm/src/sys/netinet/ip_fw.h#3 integrate
.. //depot/projects/arm/src/sys/netinet/ip_fw2.c#4 integrate
.. //depot/projects/arm/src/sys/netinet/libalias/libalias.3#2 integrate
.. //depot/projects/arm/src/sys/nfsclient/nfs_diskless.c#3 integrate
.. //depot/projects/arm/src/sys/pc98/conf/DEFAULTS#3 integrate
.. //depot/projects/arm/src/sys/pc98/conf/GENERIC#3 integrate
.. //depot/projects/arm/src/sys/pc98/conf/NOTES#4 integrate
.. //depot/projects/arm/src/sys/pci/agp_intel.c#3 integrate
.. //depot/projects/arm/src/sys/posix4/mqueue.h#2 delete
.. //depot/projects/arm/src/sys/powerpc/conf/DEFAULTS#2 integrate
.. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#4 integrate
.. //depot/projects/arm/src/sys/sparc64/conf/DEFAULTS#3 integrate
.. //depot/projects/arm/src/sys/sparc64/conf/GENERIC#6 integrate
.. //depot/projects/arm/src/sys/sparc64/conf/NOTES#4 integrate
.. //depot/projects/arm/src/sys/sys/_types.h#3 integrate
.. //depot/projects/arm/src/sys/sys/file.h#2 integrate
.. //depot/projects/arm/src/sys/sys/mount.h#4 integrate
.. //depot/projects/arm/src/sys/sys/mqueue.h#1 branch
.. //depot/projects/arm/src/sys/sys/syscall.h#4 integrate
.. //depot/projects/arm/src/sys/sys/syscall.mk#4 integrate
.. //depot/projects/arm/src/sys/sys/sysproto.h#4 integrate
.. //depot/projects/arm/src/sys/sys/time.h#4 integrate
.. //depot/projects/arm/src/sys/sys/types.h#3 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_vfsops.c#7 integrate
.. //depot/projects/arm/src/usr.sbin/config/config.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/config/config.y#3 integrate
.. //depot/projects/arm/src/usr.sbin/config/configvers.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/config/mkheaders.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/config/mkmakefile.c#2 integrate
Differences ...
==== //depot/projects/arm/src/sys/alpha/conf/DEFAULTS#2 (text+ko) ====
@@ -1,10 +1,9 @@
#
# DEFAULTS -- Default kernel configuration file for FreeBSD/alpha
#
-# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.2 2005/11/21 20:22:34 jhb Exp $
+# $FreeBSD: src/sys/alpha/conf/DEFAULTS,v 1.3 2005/11/27 23:16:58 ru Exp $
-# Not yet, this would break all existing configs
-#machine alpha
+machine alpha
# Pseudo devices.
device mem # Memory and kernel memory devices
==== //depot/projects/arm/src/sys/alpha/conf/GENERIC#4 (text+ko) ====
@@ -18,9 +18,8 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.190 2005/11/21 20:17:45 jhb Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.191 2005/11/27 23:16:58 ru Exp $
-machine alpha
cpu EV4
cpu EV5
ident GENERIC
==== //depot/projects/arm/src/sys/alpha/conf/NOTES#2 (text+ko) ====
@@ -1,14 +1,8 @@
-# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.156 2004/11/09 22:24:47 wilko Exp $
+# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.157 2005/11/27 23:16:58 ru Exp $
#
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
-# This directive is mandatory. It defines the architecture to be
-# configured for. In this case, this kernel is for a machine using
-# Alpha processors.
-#
-machine alpha
-
#####################################################################
# CPU OPTIONS
==== //depot/projects/arm/src/sys/amd64/amd64/busdma_machdep.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.70 2005/03/12 07:05:59 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.71 2005/11/24 15:28:32 le Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -978,7 +978,7 @@
SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
"total_bpages", CTLFLAG_RD, &bz->total_bpages, 0,
- "Totoal bounce pages");
+ "Total bounce pages");
SYSCTL_ADD_INT(busdma_sysctl_tree(bz),
SYSCTL_CHILDREN(busdma_sysctl_tree_top(bz)), OID_AUTO,
"free_bpages", CTLFLAG_RD, &bz->free_bpages, 0,
==== //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.16 2005/10/25 19:48:45 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.17 2005/11/28 20:18:43 jhb Exp $
*/
/*
@@ -190,6 +190,7 @@
log(LOG_CRIT,
"too many stray irq %d's: not logging anymore\n",
vector);
+ return;
}
/*
==== //depot/projects/arm/src/sys/amd64/conf/DEFAULTS#3 (text+ko) ====
@@ -1,10 +1,9 @@
#
# DEFAULTS -- Default kernel configuration file for FreeBSD/amd64
#
-# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.3 2005/11/21 20:22:34 jhb Exp $
+# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.4 2005/11/27 23:16:58 ru Exp $
-# Not yet, this would break all existing configs
-#machine amd64
+machine amd64
# Bus support.
device isa
==== //depot/projects/arm/src/sys/amd64/conf/GENERIC#6 (text+ko) ====
@@ -16,9 +16,8 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.446 2005/11/05 19:48:53 marcel Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.447 2005/11/27 23:16:58 ru Exp $
-machine amd64
cpu HAMMER
ident GENERIC
==== //depot/projects/arm/src/sys/amd64/conf/NOTES#4 (text+ko) ====
@@ -4,16 +4,10 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.48 2005/11/11 09:57:29 ru Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.50 2005/11/28 23:13:52 anholt Exp $
#
#
-# This directive is mandatory; it defines the architecture to be
-# configured for; in this case, the AMD64 family based machines.
-#
-machine amd64
-
-#
# We want LINT to cover profiling as well.
profile 2
@@ -214,6 +208,7 @@
device mgadrm # AGP Matrox G200, G400, G450, G550
device r128drm # ATI Rage 128
device radeondrm # ATI Radeon
+device savagedrm # S3 Savage3D, Savage4
device sisdrm # SiS 300/305, 540, 630
device tdfxdrm # 3dfx Voodoo 3/4/5 and Banshee
options DRM_DEBUG # Include debug printfs (slow)
==== //depot/projects/arm/src/sys/compat/linprocfs/linprocfs.c#3 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.89 2005/03/06 22:28:14 sobomax Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.90 2005/11/29 00:28:17 rodrigc Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -395,7 +395,6 @@
ADD_OPTION(MNT_SYNCHRONOUS, "sync");
ADD_OPTION(MNT_NOEXEC, "noexec");
ADD_OPTION(MNT_NOSUID, "nosuid");
- ADD_OPTION(MNT_NODEV, "nodev");
ADD_OPTION(MNT_UNION, "union");
ADD_OPTION(MNT_ASYNC, "async");
ADD_OPTION(MNT_SUIDDIR, "suiddir");
==== //depot/projects/arm/src/sys/conf/Makefile.alpha#3 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.alpha -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.alpha 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.138 2005/11/04 04:14:49 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.alpha,v 1.140 2005/11/28 17:51:30 imp Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
.if !defined(S)
.if exists(./@/.)
==== //depot/projects/arm/src/sys/conf/Makefile.amd64#3 (text+ko) ====
@@ -2,7 +2,7 @@
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
# from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49
-# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.20 2005/11/04 04:14:49 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.22 2005/11/28 17:51:30 imp Exp $
#
# Makefile for FreeBSD
#
@@ -18,7 +18,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
STD8X16FONT?= iso
==== //depot/projects/arm/src/sys/conf/Makefile.arm#5 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.arm -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.arm,v 1.18 2005/11/24 02:25:49 cognet Exp $
+# $FreeBSD: src/sys/conf/Makefile.arm,v 1.21 2005/11/28 17:51:30 imp Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
# Temporary stuff while we're still embryonic
NO_MODULES=
@@ -48,7 +48,7 @@
DDB_ENABLED!= grep DDB opt_ddb.h || true
-SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.static \
+SYSTEM_LD_ = ${LD} -Bdynamic -T ldscript.$M.noheader \
-warn-common -export-dynamic -dynamic-linker /red/herring -o \
${FULLKERNEL}.noheader -X ${SYSTEM_OBJS} vers.o
SYSTEM_LD_TAIL +=; cat ldscript.$M| \
@@ -74,7 +74,7 @@
.endif
-CLEANFILES += ldscript.$M ldscript.$M.static ${KERNEL_KO}.bin \
+CLEANFILES += ldscript.$M ldscript.$M.noheader ${KERNEL_KO}.bin \
${KERNEL_KO}.tramp ${KERNEL_KO}.tramp.bin
%BEFORE_DEPEND
==== //depot/projects/arm/src/sys/conf/Makefile.i386#3 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.i386,v 1.268 2005/11/04 04:14:49 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.i386,v 1.270 2005/11/28 17:51:30 imp Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
STD8X16FONT?= iso
==== //depot/projects/arm/src/sys/conf/Makefile.ia64#3 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.ia64 -- with config changes.
# Copyright 1990 W. Jolitz
# from: src/sys/conf/Makefile.alpha,v 1.76
-# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.65 2005/11/04 04:14:49 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.67 2005/11/28 17:51:31 imp Exp $
#
# Makefile for FreeBSD
#
@@ -19,7 +19,7 @@
GCC3= you bet
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
STD8X16FONT?= iso
==== //depot/projects/arm/src/sys/conf/Makefile.pc98#3 (text+ko) ====
@@ -3,7 +3,7 @@
# Makefile.i386 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.170 2005/11/04 04:14:49 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.172 2005/11/28 17:51:31 imp Exp $
#
# Makefile for FreeBSD
#
@@ -19,7 +19,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
.if !defined(S)
.if exists(./@/.)
==== //depot/projects/arm/src/sys/conf/Makefile.powerpc#3 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.powerpc -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.281 2005/11/04 04:14:49 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.283 2005/11/28 17:51:31 imp Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
STD8X16FONT?= iso
==== //depot/projects/arm/src/sys/conf/Makefile.sparc64#3 (text+ko) ====
@@ -1,7 +1,7 @@
# Makefile.sparc64 -- with config changes.
# Copyright 1990 W. Jolitz
# from: @(#)Makefile.i386 7.1 5/10/91
-# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.36 2005/11/04 04:14:49 imp Exp $
+# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.38 2005/11/28 17:51:31 imp Exp $
#
# Makefile for FreeBSD
#
@@ -17,7 +17,7 @@
#
# Which version of config(8) is required.
-%VERSREQ= 600003
+%VERSREQ= 600004
STD8X16FONT?= iso
==== //depot/projects/arm/src/sys/conf/NOTES#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1334 2005/10/07 06:32:11 joel Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1335 2005/11/29 05:31:46 ariff Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1922,6 +1922,7 @@
# since this is unsupported at the moment...).
#
# snd_als4000: Avance Logic ALS4000 PCI.
+# snd_atiixp: ATI IXP 200/300/400 PCI.
# snd_ad1816: Analog Devices AD1816 ISA PnP/non-PnP.
# snd_audiocs: Crystal Semiconductor CS4231 SBus/EBus.
# snd_cmi: CMedia CMI8338/CMI8738 PCI.
@@ -1957,6 +1958,7 @@
device snd_ad1816
device snd_als4000
+device snd_atiixp
#device snd_au88x0
#device snd_audiocs
device snd_cmi
==== //depot/projects/arm/src/sys/conf/files#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1066 2005/11/22 17:12:48 marius Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1071 2005/11/28 23:13:50 anholt Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -9,13 +9,8 @@
compile-with "${AWK} -f $S/tools/acpi_quirks2h.awk $S/dev/acpica/acpi_quirks" \
no-obj no-implicit-rule before-depend \
clean "acpi_quirks.h"
-aicasm optional ahc \
- dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \
- compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \
- no-obj no-implicit-rule \
- clean "aicasm* y.tab.h"
-aicasm optional ahd \
- dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \
+aicasm optional ahc | ahd \
+ dependency "$S/dev/aic7xxx/aicasm/*.[chyl]" \
compile-with "CC=${CC} ${MAKE} -f $S/dev/aic7xxx/aicasm/Makefile MAKESRCPATH=$S/dev/aic7xxx/aicasm" \
no-obj no-implicit-rule \
clean "aicasm* y.tab.h"
@@ -89,14 +84,8 @@
cam/scsi/scsi_cd.c optional cd
cam/scsi/scsi_ch.c optional ch
cam/scsi/scsi_da.c optional da
-cam/scsi/scsi_low.c optional ct
-cam/scsi/scsi_low.c optional ncv
-cam/scsi/scsi_low.c optional nsp
-cam/scsi/scsi_low.c optional stg
-cam/scsi/scsi_low_pisa.c optional ct
-cam/scsi/scsi_low_pisa.c optional ncv
-cam/scsi/scsi_low_pisa.c optional nsp
-cam/scsi/scsi_low_pisa.c optional stg
+cam/scsi/scsi_low.c optional ct | ncv | nsp | stg
+cam/scsi/scsi_low_pisa.c optional ct | ncv | nsp | stg
cam/scsi/scsi_pass.c optional pass
cam/scsi/scsi_pt.c optional pt
cam/scsi/scsi_sa.c optional sa
@@ -344,33 +333,17 @@
compile-with "${NORMAL_C} -I$S/contrib/pf"
contrib/pf/netinet/in4_cksum.c optional pf inet
crypto/blowfish/bf_ecb.c optional ipsec ipsec_esp
-crypto/blowfish/bf_skey.c optional crypto
-crypto/blowfish/bf_skey.c optional ipsec ipsec_esp
-crypto/des/des_ecb.c optional crypto
-crypto/des/des_ecb.c optional ipsec ipsec_esp
-crypto/des/des_ecb.c optional netsmbcrypto
-crypto/des/des_setkey.c optional crypto
-crypto/des/des_setkey.c optional ipsec ipsec_esp
-crypto/des/des_setkey.c optional netsmbcrypto
+crypto/blowfish/bf_skey.c optional crypto | ipsec ipsec_esp
+crypto/des/des_ecb.c optional crypto | ipsec ipsec_esp | netsmbcrypto
+crypto/des/des_setkey.c optional crypto | ipsec ipsec_esp | netsmbcrypto
crypto/rc4/rc4.c optional netgraph_mppc_encryption
-crypto/rijndael/rijndael-alg-fst.c optional crypto
-crypto/rijndael/rijndael-alg-fst.c optional geom_bde
-crypto/rijndael/rijndael-alg-fst.c optional ipsec
-crypto/rijndael/rijndael-alg-fst.c optional random
-crypto/rijndael/rijndael-alg-fst.c optional wlan_ccmp
-crypto/rijndael/rijndael-api-fst.c optional geom_bde
-crypto/rijndael/rijndael-api-fst.c optional random
-crypto/rijndael/rijndael-api.c optional crypto
-crypto/rijndael/rijndael-api.c optional ipsec
-crypto/rijndael/rijndael-api.c optional wlan_ccmp
-crypto/sha1.c optional carp
-crypto/sha1.c optional netgraph_mppc_encryption
-crypto/sha1.c optional crypto
-crypto/sha1.c optional ipsec
-crypto/sha2/sha2.c optional crypto
-crypto/sha2/sha2.c optional geom_bde
-crypto/sha2/sha2.c optional ipsec
-crypto/sha2/sha2.c optional random
+crypto/rijndael/rijndael-alg-fst.c optional crypto | geom_bde | \
+ ipsec | random | wlan_ccmp
+crypto/rijndael/rijndael-api-fst.c optional geom_bde | random
+crypto/rijndael/rijndael-api.c optional crypto | ipsec | wlan_ccmp
+crypto/sha1.c optional carp | crypto | ipsec | \
+ netgraph_mppc_encryption
+crypto/sha2/sha2.c optional crypto | geom_bde | ipsec | random
ddb/db_access.c optional ddb
ddb/db_break.c optional ddb
ddb/db_command.c optional ddb
@@ -488,10 +461,10 @@
dev/ata/atapi-cd.c optional atapicd
dev/ata/atapi-fd.c optional atapifd
dev/ata/atapi-tape.c optional atapist
-dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr
-dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \
+dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr
+dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \
compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd"
-dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \
+dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \
compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd"
dev/ath/if_ath.c optional ath \
compile-with "${NORMAL_C} -I$S/contrib/dev/ath/freebsd"
@@ -583,6 +556,9 @@
dev/drm/radeon_irq.c optional radeondrm
dev/drm/radeon_mem.c optional radeondrm
dev/drm/radeon_state.c optional radeondrm
+dev/drm/savage_bci.c optional savagedrm
+dev/drm/savage_drv.c optional savagedrm
+dev/drm/savage_state.c optional savagedrm
dev/drm/sis_drv.c optional sisdrm
dev/drm/sis_ds.c optional sisdrm
dev/drm/sis_mm.c optional sisdrm
@@ -661,12 +637,10 @@
dev/ida/ida_pci.c optional ida pci
dev/ie/if_ie.c optional ie isa nowerror
dev/ie/if_ie_isa.c optional ie isa
-dev/ieee488/ibfoo.c optional pcii
-dev/ieee488/ibfoo.c optional tnt4882
-dev/ieee488/pcii.c optional pcii
+dev/ieee488/ibfoo.c optional pcii | tnt4882
+dev/ieee488/pcii.c optional pcii
dev/ieee488/tnt4882.c optional tnt4882
-dev/ieee488/upd7210.c optional pcii
-dev/ieee488/upd7210.c optional tnt4882
+dev/ieee488/upd7210.c optional pcii | tnt4882
dev/iicbus/if_ic.c optional ic
dev/iicbus/iic.c optional iic
dev/iicbus/iicbb.c optional iicbb
@@ -782,10 +756,8 @@
dev/pci/pcib_if.m standard
dev/pdq/if_fea.c optional fea eisa
dev/pdq/if_fpa.c optional fpa pci
-dev/pdq/pdq.c optional fea eisa nowerror
-dev/pdq/pdq.c optional fpa pci nowerror
-dev/pdq/pdq_ifsubr.c optional fea eisa nowerror
-dev/pdq/pdq_ifsubr.c optional fpa pci nowerror
+dev/pdq/pdq.c optional nowerror fea eisa | fpa pci
+dev/pdq/pdq_ifsubr.c optional nowerror fea eisa | fpa pci
dev/ppbus/if_plip.c optional plip
dev/ppbus/immio.c optional vpo
dev/ppbus/lpbb.c optional lpbb
@@ -807,8 +779,7 @@
dev/puc/puc_ebus.c optional puc ebus
dev/puc/puc_pccard.c optional puc pccard
dev/puc/puc_pci.c optional puc pci
-dev/puc/puc_sbus.c optional puc fhc
-dev/puc/puc_sbus.c optional puc sbus
+dev/puc/puc_sbus.c optional puc fhc | puc sbus
dev/puc/pucdata.c optional puc pci
dev/ral/if_ral.c optional ral
dev/ral/if_ralrate.c optional ral
@@ -829,7 +800,7 @@
dev/rp/rp_pci.c optional rp pci
dev/sab/sab.c optional sab ebus
dev/safe/safe.c optional safe
-dev/sbsh/if_sbsh.c optional sbsh
+dev/sbsh/if_sbsh.c optional sbsh
dev/scd/scd.c optional scd isa
dev/scd/scd_isa.c optional scd isa
dev/si/si.c optional si
@@ -859,6 +830,7 @@
dev/sound/isa/sbc.c optional snd_sbc isa
dev/sound/isa/sndbuf_dma.c optional sound isa
dev/sound/pci/als4000.c optional snd_als4000 pci
+dev/sound/pci/atiixp.c optional snd_atiixp pci
#dev/sound/pci/au88x0.c optional snd_au88x0 pci
dev/sound/pci/cmi.c optional snd_cmi pci
dev/sound/pci/cs4281.c optional snd_cs4281 pci
@@ -872,7 +844,7 @@
dev/sound/pci/es137x.c optional snd_es137x pci
dev/sound/pci/fm801.c optional snd_fm801 pci
dev/sound/pci/ich.c optional snd_ich pci
-dev/sound/pci/maestro.c optional snd_maestro pci
+dev/sound/pci/maestro.c optional snd_maestro pci
dev/sound/pci/maestro3.c optional snd_maestro3 pci \
warning "kernel contains GPL contaminated maestro3 headers"
dev/sound/pci/neomagic.c optional snd_neomagic pci
@@ -1112,8 +1084,7 @@
geom/geom_apple.c optional geom_apple
geom/geom_bsd.c optional geom_bsd
geom/geom_bsd_enc.c optional geom_bsd
-geom/geom_ccd.c optional ccd
-geom/geom_ccd.c optional geom_ccd
+geom/geom_ccd.c optional ccd | geom_ccd
geom/geom_ctl.c standard
geom/geom_dev.c standard
geom/geom_disk.c standard
@@ -1177,11 +1148,10 @@
i4b/driver/i4b_rbch.c optional i4brbch
i4b/driver/i4b_tel.c optional i4btel
i4b/driver/i4b_ipr.c optional i4bipr
-net/slcompress.c optional i4bipr
+net/slcompress.c optional i4bipr | i4bisppp
i4b/driver/i4b_ctl.c optional i4bctl
i4b/driver/i4b_ing.c optional i4bing
i4b/driver/i4b_isppp.c optional i4bisppp
-net/slcompress.c optional i4bisppp
#
# isdn4bsd CAPI driver
#
@@ -1363,6 +1333,7 @@
kern/uipc_domain.c standard
kern/uipc_mbuf.c standard
kern/uipc_mbuf2.c standard
+kern/uipc_mqueue.c optional p1003_1b_mqueue
kern/uipc_proto.c standard
kern/uipc_sem.c optional p1003_1b_semaphores
kern/uipc_socket.c standard
@@ -1426,8 +1397,7 @@
libkern/strtouq.c standard
libkern/strvalid.c standard
net/bpf.c standard
-net/bpf_filter.c optional bpf
-net/bpf_filter.c optional netgraph_bpf
+net/bpf_filter.c optional bpf | netgraph_bpf
net/bridgestp.c optional if_bridge
net/bsd_comp.c optional ppp_bsdcomp
net/if.c standard
@@ -1449,10 +1419,8 @@
net/if_mib.c standard
net/if_ppp.c optional ppp
net/if_sl.c optional sl
-net/if_spppfr.c optional sppp
-net/if_spppfr.c optional i4bisppp
-net/if_spppsubr.c optional sppp
-net/if_spppsubr.c optional i4bisppp
+net/if_spppfr.c optional i4bisppp | sppp
+net/if_spppsubr.c optional i4bisppp | sppp
net/if_stf.c optional stf
net/if_tun.c optional tun
net/if_tap.c optional tap
@@ -1460,21 +1428,15 @@
net/netisr.c standard
net/ppp_deflate.c optional ppp_deflate
net/ppp_tty.c optional ppp
-net/pfil.c optional ether
-net/pfil.c optional inet
+net/pfil.c optional ether | inet
net/radix.c standard
net/raw_cb.c standard
net/raw_usrreq.c standard
net/route.c standard
net/rtsock.c standard
-net/slcompress.c optional netgraph_vjc
-net/slcompress.c optional ppp
-net/slcompress.c optional sl
-net/slcompress.c optional sppp
-net/zlib.c optional ppp_deflate
-net/zlib.c optional ipsec
-net/zlib.c optional crypto
-net/zlib.c optional geom_uzip
+net/slcompress.c optional netgraph_vjc | ppp | sl | sppp
+net/zlib.c optional crypto | geom_uzip | ipsec | \
+ ppp_deflate
net80211/ieee80211.c optional wlan
net80211/ieee80211_acl.c optional wlan_acl
net80211/ieee80211_crypto.c optional wlan
@@ -1526,19 +1488,19 @@
netatm/spans/spans_subr.c optional atm_spans atm_core
netatm/spans/spans_util.c optional atm_spans atm_core
spans_xdr.h optional atm_spans atm_core \
- before-depend \
- dependency "$S/netatm/spans/spans_xdr.x" \
- compile-with "rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \
- clean "spans_xdr.h" \
- no-obj no-implicit-rule
+ before-depend \
+ dependency "$S/netatm/spans/spans_xdr.x" \
+ compile-with "rpcgen -h -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.h" \
+ clean "spans_xdr.h" \
+ no-obj no-implicit-rule
spans_xdr.c optional atm_spans atm_core \
- before-depend \
- dependency "$S/netatm/spans/spans_xdr.x" \
- compile-with "rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \
- clean "spans_xdr.c" \
- no-obj no-implicit-rule local
+ before-depend \
+ dependency "$S/netatm/spans/spans_xdr.x" \
+ compile-with "rpcgen -c -C $S/netatm/spans/spans_xdr.x | grep -v rpc/rpc.h > spans_xdr.c" \
+ clean "spans_xdr.c" \
+ no-obj no-implicit-rule local
spans_xdr.o optional atm_spans atm_core \
- dependency "$S/netatm/spans/spans_xdr.x" \
+ dependency "$S/netatm/spans/spans_xdr.x" \
compile-with "${NORMAL_C}" \
no-implicit-rule local
netatm/uni/q2110_sigaa.c optional atm_uni atm_core
@@ -1635,8 +1597,8 @@
netgraph/ng_ksocket.c optional netgraph_ksocket
netgraph/ng_l2tp.c optional netgraph_l2tp
netgraph/ng_lmi.c optional netgraph_lmi
-netgraph/ng_mppc.c optional netgraph_mppc_compression
-netgraph/ng_mppc.c optional netgraph_mppc_encryption
+netgraph/ng_mppc.c optional netgraph_mppc_compression | \
+ netgraph_mppc_encryption
netgraph/ng_nat.c optional netgraph_nat
netgraph/ng_one2many.c optional netgraph_one2many
netgraph/ng_parse.c optional netgraph
@@ -1667,10 +1629,8 @@
netinet/in_rmx.c optional inet
netinet/ip_divert.c optional ipdivert
netinet/ip_dummynet.c optional dummynet
-netinet/ip_ecn.c optional inet
-netinet/ip_ecn.c optional inet6
-netinet/ip_encap.c optional inet
-netinet/ip_encap.c optional inet6
+netinet/ip_ecn.c optional inet | inet6
+netinet/ip_encap.c optional inet | inet6
netinet/ip_fastfwd.c optional inet
netinet/ip_fw2.c optional ipfirewall
netinet/ip_fw_pfil.c optional ipfirewall
@@ -1787,8 +1747,7 @@
netsmb/smb_subr.c optional netsmb
netsmb/smb_trantcp.c optional netsmb
netsmb/smb_usr.c optional netsmb
-nfs/nfs_common.c optional nfsclient
-nfs/nfs_common.c optional nfsserver
+nfs/nfs_common.c optional nfsclient | nfsserver
nfs4client/nfs4_dev.c optional nfsclient
nfs4client/nfs4_idmap.c optional nfsclient
nfs4client/nfs4_socket.c optional nfsclient
@@ -1814,22 +1773,19 @@
nfsserver/nfs_srvsubs.c optional nfsserver
nfsserver/nfs_syscalls.c optional nfsserver
# crypto support
-opencrypto/cast.c optional crypto
-opencrypto/cast.c optional ipsec ipsec_esp
+opencrypto/cast.c optional crypto | ipsec ipsec_esp
opencrypto/criov.c optional crypto
opencrypto/crypto.c optional crypto
opencrypto/cryptodev.c optional cryptodev
opencrypto/cryptosoft.c optional crypto
opencrypto/deflate.c optional crypto
-opencrypto/rmd160.c optional crypto
-opencrypto/rmd160.c optional ipsec
+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
-pci/amdpm.c optional nfpm pci
+pci/amdpm.c optional amdpm pci | nfpm pci
pci/if_de.c optional de pci
pci/if_mn.c optional mn pci
pci/if_pcn.c optional pcn pci
==== //depot/projects/arm/src/sys/conf/files.alpha#3 (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.121 2005/06/14 04:16:10 marcel Exp $
+# $FreeBSD: src/sys/conf/files.alpha,v 1.123 2005/11/27 21:41:58 ru Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -47,7 +47,6 @@
alpha/alpha/db_interface.c optional ddb
alpha/alpha/db_trace.c optional ddb
alpha/alpha/dec_1000a.c optional dec_1000a
-alpha/alpha/dec_1000a.c optional dec_1000a
alpha/alpha/dec_2100_a50.c optional dec_2100_a50
alpha/alpha/dec_2100_a500.c optional dec_2100_a500
alpha/alpha/dec_axppci_33.c optional dec_axppci_33
@@ -96,45 +95,30 @@
alpha/mcbus/mcbus.c optional dec_kn300
alpha/mcbus/mcmem.c optional dec_kn300
alpha/mcbus/mcpcia.c optional dec_kn300
-alpha/osf1/imgact_osf1.c optional compat_linux
-alpha/osf1/imgact_osf1.c optional compat_osf1
-alpha/osf1/osf1_ioctl.c optional compat_linux
-alpha/osf1/osf1_ioctl.c optional compat_osf1
-alpha/osf1/osf1_misc.c optional compat_linux
-alpha/osf1/osf1_misc.c optional compat_osf1
-alpha/osf1/osf1_mount.c optional compat_linux
-alpha/osf1/osf1_mount.c optional compat_osf1
-alpha/osf1/osf1_signal.c optional compat_linux
-alpha/osf1/osf1_signal.c optional compat_osf1
-alpha/osf1/osf1_sysent.c optional compat_linux
-alpha/osf1/osf1_sysent.c optional compat_osf1
-alpha/osf1/osf1_sysvec.c optional compat_linux
-alpha/osf1/osf1_sysvec.c optional compat_osf1
+alpha/osf1/imgact_osf1.c optional compat_linux | compat_osf1
+alpha/osf1/osf1_ioctl.c optional compat_linux | compat_osf1
+alpha/osf1/osf1_misc.c optional compat_linux | compat_osf1
+alpha/osf1/osf1_mount.c optional compat_linux | compat_osf1
+alpha/osf1/osf1_signal.c optional compat_linux | compat_osf1
+alpha/osf1/osf1_sysent.c optional compat_linux | compat_osf1
+alpha/osf1/osf1_sysvec.c optional compat_linux | compat_osf1
alpha/pci/alphapci_if.m optional pci
-alpha/pci/apecs.c optional dec_2100_a50
-alpha/pci/apecs.c optional dec_eb64plus
-alpha/pci/apecs.c optional dec_1000a
-alpha/pci/apecs_pci.c optional dec_2100_a50
-alpha/pci/apecs_pci.c optional dec_eb64plus
-alpha/pci/apecs_pci.c optional dec_1000a
+alpha/pci/apecs.c optional dec_1000a | dec_2100_a50 | \
+ dec_eb64plus
+alpha/pci/apecs_pci.c optional dec_1000a | dec_2100_a50 | \
+ dec_eb64plus
alpha/pci/bwx.c optional pci
-alpha/pci/cia.c optional dec_eb164
-alpha/pci/cia.c optional dec_kn20aa
-alpha/pci/cia.c optional dec_st550
-alpha/pci/cia.c optional dec_1000a
-alpha/pci/cia_pci.c optional dec_eb164
-alpha/pci/cia_pci.c optional dec_kn20aa
-alpha/pci/cia_pci.c optional dec_st550
-alpha/pci/cia_pci.c optional dec_1000a
+alpha/pci/cia.c optional dec_1000a | dec_eb164 | \
+ dec_kn20aa | dec_st550
+alpha/pci/cia_pci.c optional dec_1000a | dec_eb164 | \
+ dec_kn20aa | dec_st550
alpha/pci/irongate.c optional api_up1000
alpha/pci/irongate_pci.c optional api_up1000
alpha/pci/lca.c optional dec_axppci_33
alpha/pci/lca_pci.c optional dec_axppci_33
-alpha/pci/pci_eb164_intr.s optional dec_eb164
-alpha/pci/pci_eb164_intr.s optional dec_kn20aa
-alpha/pci/pci_eb164_intr.s optional dec_st550
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list