From owner-p4-projects@FreeBSD.ORG Tue Jul 17 21:19:41 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 333C616A406; Tue, 17 Jul 2007 21:19:41 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B7CCE16A404 for ; Tue, 17 Jul 2007 21:19:40 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A64C413C428 for ; Tue, 17 Jul 2007 21:19:40 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l6HLJeAO079440 for ; Tue, 17 Jul 2007 21:19:40 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l6HLJdue079437 for perforce@freebsd.org; Tue, 17 Jul 2007 21:19:39 GMT (envelope-from lulf@FreeBSD.org) Date: Tue, 17 Jul 2007 21:19:39 GMT Message-Id: <200707172119.l6HLJdue079437@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 123665 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Jul 2007 21:19:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=123665 Change 123665 by lulf@lulf_carrot on 2007/07/17 21:19:36 IFC Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/Makefile.inc1#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/Makefile#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/NOTES#10 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files#12 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.amd64#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.arm#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.i386#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.ia64#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.pc98#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.powerpc#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.sparc64#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.sun4v#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/kmod.mk#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options#9 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options.amd64#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options.i386#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options.pc98#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/conf/GENERIC#6 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/conf/NOTES#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/sys_machdep.c#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/ibcs2/ibcs2_xenix.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/i4b_cause.h#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/i4b_debug.h#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/i4b_ioctl.h#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/i4b_trace.h#2 delete .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/include/pc/vesa.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/i386/linux/linux_machdep.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/Make.tags.inc#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/init_sysent.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_conf.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_descrip.c#6 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_event.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_exec.c#6 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_lockf.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_priv.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_resource.c#6 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/kern_sx.c#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/makesyscalls.sh#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_smp.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/subr_unit.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/sys_generic.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/syscalls.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/syscalls.master#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/systrace_args.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/sysv_sem.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/tty_pts.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/tty_pty.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/tty_tty.c#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_mount.c#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/modules/Makefile#7 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/conf.h#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/lock_profile.h#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/mbuf.h#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/param.h#6 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sx.h#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/syscall.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/syscall.mk#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sysent.h#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/sysproto.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/sys/systm.h#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_fault.c#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_meter.c#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_mmap.c#5 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_page.c#7 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_page.h#4 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_pageout.c#8 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_phys.c#3 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_phys.h#2 integrate .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/vm/vm_zeroidle.c#5 integrate Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/Makefile.inc1#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.582 2007/05/26 20:17:19 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -967,6 +967,7 @@ .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ + usr.bin/sed \ usr.bin/xlint/lint1 usr.bin/xlint/lint2 usr.bin/xlint/xlint \ ${_btxld} \ ${_crunchide} \ ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.43 2007/07/01 11:38:26 gnn Exp $ +# $FreeBSD: src/sys/Makefile,v 1.45 2007/07/12 21:04:55 rwatson Exp $ .include @@ -8,9 +8,9 @@ .endif # Directories to include in cscope name file and TAGS. -CSCOPEDIRS= bsm cam coda compat conf contrib crypto ddb dev fs geom gnu \ +CSCOPEDIRS= bsm cam compat conf contrib crypto ddb dev fs geom gnu \ i4b isa kern libkern modules net net80211 netatalk netatm \ - netgraph netinet netinet6 netipx netnatm netncp \ + netgraph netinet netinet6 netipsec netipx netnatm netncp \ netsmb nfs nfsclient nfs4client rpc pccard pci security sys \ ufs vm ${ARCHDIR} @@ -24,12 +24,14 @@ HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` +# You need the devel/cscope port for this. cscope: ${.CURDIR}/cscopenamefile cd ${.CURDIR}; cscope -k -p4 -i cscopenamefile ${.CURDIR}/cscopenamefile: cd ${.CURDIR}; find ${CSCOPEDIRS} -name "*.[csh]" > ${.TARGET} +# You need the devel/global and one of editor/emacs* ports for that. TAGS ${.CURDIR}/TAGS: ${.CURDIR}/cscopenamefile rm -f ${.CURDIR}/TAGS cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscopenamefile ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/NOTES#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1439 2007/07/01 11:38:26 gnn Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1444 2007/07/14 21:49:23 rwatson Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -490,13 +490,14 @@ # NETWORKING OPTIONS # -# Protocol families: -# Only the INET (Internet) family is officially supported in FreeBSD. +# Protocol families # options INET #Internet communications protocols options INET6 #IPv6 communications protocols -#options IPSEC #IP security -#options IPSEC_ESP #IP security (crypto; define w/ IPSEC) + +# In order to enable IPSEC you MUST also add device crypto to +# your kernel configuration +options IPSEC #IP security (requires device crypto) #options IPSEC_DEBUG #debug for IP security # # Set IPSEC_FILTERGIF to force packets coming through a gif tunnel @@ -509,8 +510,6 @@ # #options IPSEC_FILTERGIF #filter ipsec packets from a tunnel -options FAST_IPSEC #new IPsec (cannot define w/ IPSEC) - options IPX #IPX/SPX communications protocols options NCP #NetWare Core protocol @@ -559,14 +558,6 @@ # faster.. if you are not debugging don't use. options SCTP_DEBUG # -# High speed enables sally floyds HS TCP optioin -# for congestion control increase, use only in -# very HS networks and with caution since I doubt -# it will compete fairly with peers. For the big-bad -# internet its best NOT to enable. -# -options SCTP_HIGH_SPEED -# # This option turns off the CRC32c checksum. Basically # You will not be able to talk to anyone else that # has not done this. Its more for expermentation to @@ -635,7 +626,7 @@ options NETGRAPH_ATM_ATMPIF options NETGRAPH_BLUETOOTH # ng_bluetooth(4) options NETGRAPH_BLUETOOTH_BT3C # ng_bt3c(4) -options NETGRAPH_BLUETOOTH_H4 # ng_h4(4) +# options NETGRAPH_BLUETOOTH_H4 # ng_h4(4) - not MPSAFE options NETGRAPH_BLUETOOTH_HCI # ng_hci(4) options NETGRAPH_BLUETOOTH_L2CAP # ng_l2cap(4) options NETGRAPH_BLUETOOTH_SOCKET # ng_btsocket(4) @@ -786,7 +777,7 @@ device pfsync #synchronization interface for PF options PF_MPSAFE_UGID #Workaround LOR with user/group rules device carp #Common Address Redundancy Protocol -device enc #IPSec interface (needs FAST_IPSEC) +device enc #IPsec interface device ppp #Point-to-point protocol options PPP_BSDCOMP #PPP BSD-compress support options PPP_DEFLATE #PPP zlib/deflate/gzip support @@ -880,8 +871,8 @@ # carried in TCP option 19. This option is commonly used to protect # TCP sessions (e.g. BGP) where IPSEC is not available nor desirable. # This is enabled on a per-socket basis using the TCP_MD5SIG socket option. -# This requires the use of 'device crypto', 'options FAST_IPSEC' or 'options -# IPSEC', and 'device cryptodev'. +# This requires the use of 'device crypto', 'options IPSEC' +# or 'device cryptodev'. #options TCP_SIGNATURE #include support for RFC 2385 # DUMMYNET enables the "dummynet" bandwidth limiter. You need IPFIREWALL @@ -900,6 +891,8 @@ # # ATM (HARP version) options # +# XXX: These have been disabled in FreeBSD 7.0 as they are not MPSAFE. +# # ATM_CORE includes the base ATM functionality code. This must be included # for ATM support. # @@ -918,14 +911,14 @@ # # The `harp' pseudo-driver makes all NATM interface drivers available to HARP. # -options ATM_CORE #core ATM protocol family -options ATM_IP #IP over ATM support -options ATM_SIGPVC #SIGPVC signalling manager -options ATM_SPANS #SPANS signalling manager -options ATM_UNI #UNI signalling manager +#options ATM_CORE #core ATM protocol family +#options ATM_IP #IP over ATM support +#options ATM_SIGPVC #SIGPVC signalling manager +#options ATM_SPANS #SPANS signalling manager +#options ATM_UNI #UNI signalling manager -device hfa #FORE PCA-200E ATM PCI -device harp #Pseudo-interface for NATM +#device hfa #FORE PCA-200E ATM PCI +#device harp #Pseudo-interface for NATM ##################################################################### @@ -2513,7 +2506,7 @@ # crypto subsystem # # This is a port of the OpenBSD crypto framework. Include this when -# configuring FAST_IPSEC and when you have a h/w crypto device to accelerate +# configuring IPSEC and when you have a h/w crypto device to accelerate # user applications that link to OpenSSL. # # Drivers are ports from OpenBSD with some simple enhancements that have ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1227 2007/07/01 12:42:37 gnn Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1238 2007/07/14 21:49:23 rwatson Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -103,13 +103,6 @@ cam/scsi/scsi_sg.c optional sg cam/scsi/scsi_targ_bh.c optional targbh cam/scsi/scsi_target.c optional targ -coda/coda_fbsd.c optional vcoda -coda/coda_namecache.c optional vcoda -coda/coda_psdev.c optional vcoda -coda/coda_subr.c optional vcoda -coda/coda_venus.c optional vcoda -coda/coda_vfsops.c optional vcoda -coda/coda_vnops.c optional vcoda contrib/altq/altq/altq_cbq.c optional altq \ compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/altq/altq/altq_cdnr.c optional altq @@ -276,7 +269,7 @@ contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet \ compile-with "${NORMAL_C} -I$S/contrib/ipfilter" contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm \ - compile-with "${NORMAL_C} -I$S/contrib/ngatm" + compile-with "${NORMAL_C_NOWERROR} -I$S/contrib/ngatm" contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm \ compile-with "${NORMAL_C} -I$S/contrib/ngatm" contrib/ngatm/netnatm/api/cc_dump.c optional ngatm_ccatm \ @@ -327,23 +320,25 @@ compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/pf/net/pf_if.c optional pf \ compile-with "${NORMAL_C} -I$S/contrib/pf" -contrib/pf/net/pf_subr.c optional pf \ - compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/pf/net/pf_ioctl.c optional pf \ compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/pf/net/pf_norm.c optional pf \ compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf_osfp.c optional pf \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf_ruleset.c optional pf \ + compile-with "${NORMAL_C} -I$S/contrib/pf" +contrib/pf/net/pf_subr.c optional pf \ + compile-with "${NORMAL_C} -I$S/contrib/pf" contrib/pf/net/pf_table.c optional pf \ compile-with "${NORMAL_C} -I$S/contrib/pf" -contrib/pf/net/pf_osfp.c optional pf \ - 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 | ipsec ipsec_esp -crypto/camellia/camellia.c optional crypto | ipsec ipsec_esp -crypto/camellia/camellia-api.c optional crypto | ipsec ipsec_esp -crypto/des/des_ecb.c optional crypto | ipsec ipsec_esp | netsmb -crypto/des/des_setkey.c optional crypto | ipsec ipsec_esp | netsmb +crypto/blowfish/bf_ecb.c optional ipsec +crypto/blowfish/bf_skey.c optional crypto | ipsec +crypto/camellia/camellia.c optional crypto | ipsec +crypto/camellia/camellia-api.c optional crypto | ipsec +crypto/des/des_ecb.c optional crypto | ipsec | netsmb +crypto/des/des_setkey.c optional crypto | ipsec | netsmb crypto/rc4/rc4.c optional netgraph_mppc_encryption crypto/rijndael/rijndael-alg-fst.c optional crypto | geom_bde | \ ipsec | random | wlan_ccmp @@ -664,28 +659,28 @@ dev/fxp/if_fxp.c optional fxp dev/gem/if_gem.c optional gem dev/gem/if_gem_pci.c optional gem pci -dev/harp/if_harp.c optional harp pci +#dev/harp/if_harp.c optional harp pci dev/hatm/if_hatm.c optional hatm pci dev/hatm/if_hatm_intr.c optional hatm pci dev/hatm/if_hatm_ioctl.c optional hatm pci dev/hatm/if_hatm_rx.c optional hatm pci dev/hatm/if_hatm_tx.c optional hatm pci -dev/hfa/fore_buffer.c optional hfa -dev/hfa/fore_command.c optional hfa -dev/hfa/fore_globals.c optional hfa -dev/hfa/fore_if.c optional hfa -dev/hfa/fore_init.c optional hfa -dev/hfa/fore_intr.c optional hfa -dev/hfa/fore_output.c optional hfa -dev/hfa/fore_receive.c optional hfa -dev/hfa/fore_stats.c optional hfa -dev/hfa/fore_timer.c optional hfa -dev/hfa/fore_transmit.c optional hfa -dev/hfa/fore_vcm.c optional hfa -#dev/hfa/hfa_eisa.c optional hfa eisa -dev/hfa/hfa_freebsd.c optional hfa -dev/hfa/hfa_pci.c optional hfa pci -#dev/hfa/hfa_sbus.c optional hfa sbus +#dev/hfa/fore_buffer.c optional hfa +#dev/hfa/fore_command.c optional hfa +#dev/hfa/fore_globals.c optional hfa +#dev/hfa/fore_if.c optional hfa +#dev/hfa/fore_init.c optional hfa +#dev/hfa/fore_intr.c optional hfa +#dev/hfa/fore_output.c optional hfa +#dev/hfa/fore_receive.c optional hfa +#dev/hfa/fore_stats.c optional hfa +#dev/hfa/fore_timer.c optional hfa +#dev/hfa/fore_transmit.c optional hfa +#dev/hfa/fore_vcm.c optional hfa +##dev/hfa/hfa_eisa.c optional hfa eisa +#dev/hfa/hfa_freebsd.c optional hfa +#dev/hfa/hfa_pci.c optional hfa pci +##dev/hfa/hfa_sbus.c optional hfa sbus dev/hifn/hifn7751.c optional hifn dev/hme/if_hme.c optional hme dev/hme/if_hme_pci.c optional hme pci @@ -737,6 +732,16 @@ dev/ixgb/if_ixgb.c optional ixgb dev/ixgb/ixgb_ee.c optional ixgb dev/ixgb/ixgb_hw.c optional ixgb +dev/ixgbe/ixgbe.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_phy.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_api.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_common.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" +dev/ixgbe/ixgbe_82598.c optional ixgbe \ + compile-with "${NORMAL_C} -I$S/dev/ixgbe" dev/joy/joy.c optional joy dev/joy/joy_isa.c optional joy isa dev/joy/joy_pccard.c optional joy pccard @@ -1146,6 +1151,13 @@ dev/wl/if_wl.c optional wl isa dev/xe/if_xe.c optional xe dev/xe/if_xe_pccard.c optional xe pccard +fs/coda/coda_fbsd.c optional vcoda +fs/coda/coda_namecache.c optional vcoda +fs/coda/coda_psdev.c optional vcoda +fs/coda/coda_subr.c optional vcoda +fs/coda/coda_venus.c optional vcoda +fs/coda/coda_vfsops.c optional vcoda +fs/coda/coda_vnops.c optional vcoda fs/deadfs/dead_vnops.c standard fs/devfs/devfs_devs.c standard fs/devfs/devfs_rule.c standard @@ -1307,11 +1319,11 @@ i4b/driver/i4b_trace.c optional i4btrc i4b/driver/i4b_rbch.c optional i4brbch i4b/driver/i4b_tel.c optional i4btel -i4b/driver/i4b_ipr.c optional i4bipr +#XXXBZ#i4b/driver/i4b_ipr.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 +#XXXBZ#i4b/driver/i4b_ing.c optional i4bing +#XXXBZ#i4b/driver/i4b_isppp.c optional i4bisppp # # isdn4bsd CAPI driver # @@ -1584,7 +1596,8 @@ net/if_edsc.c optional edsc net/if_ef.c optional ef net/if_enc.c optional enc -net/if_ethersubr.c optional ether +net/if_ethersubr.c optional ether \ + compile-with "${NORMAL_C} -I$S/contrib/pf" net/if_faith.c optional faith net/if_fddisubr.c optional fddi net/if_fwsubr.c optional fwip @@ -1647,88 +1660,92 @@ netatalk/ddp_output.c optional netatalk netatalk/ddp_pcb.c optional netatalk netatalk/ddp_usrreq.c optional netatalk -netatm/atm_aal5.c optional atm_core -netatm/atm_cm.c optional atm_core -netatm/atm_device.c optional atm_core -netatm/atm_if.c optional atm_core -netatm/atm_proto.c optional atm_core -netatm/atm_signal.c optional atm_core -netatm/atm_socket.c optional atm_core -netatm/atm_subr.c optional atm_core -netatm/atm_usrreq.c optional atm_core -netatm/ipatm/ipatm_event.c optional atm_ip atm_core -netatm/ipatm/ipatm_if.c optional atm_ip atm_core -netatm/ipatm/ipatm_input.c optional atm_ip atm_core -netatm/ipatm/ipatm_load.c optional atm_ip atm_core -netatm/ipatm/ipatm_output.c optional atm_ip atm_core -netatm/ipatm/ipatm_usrreq.c optional atm_ip atm_core -netatm/ipatm/ipatm_vcm.c optional atm_ip atm_core -netatm/sigpvc/sigpvc_if.c optional atm_sigpvc atm_core -netatm/sigpvc/sigpvc_subr.c optional atm_sigpvc atm_core -netatm/spans/spans_arp.c optional atm_spans atm_core \ - dependency "spans_xdr.h" -netatm/spans/spans_cls.c optional atm_spans atm_core -netatm/spans/spans_if.c optional atm_spans atm_core -netatm/spans/spans_kxdr.c optional atm_spans atm_core -netatm/spans/spans_msg.c optional atm_spans atm_core -netatm/spans/spans_print.c optional atm_spans atm_core -netatm/spans/spans_proto.c optional atm_spans atm_core -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 -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 -spans_xdr.o optional atm_spans atm_core \ - 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 -netatm/uni/q2110_sigcpcs.c optional atm_uni atm_core -netatm/uni/q2110_subr.c optional atm_uni atm_core -netatm/uni/qsaal1_sigaa.c optional atm_uni atm_core -netatm/uni/qsaal1_sigcpcs.c optional atm_uni atm_core -netatm/uni/qsaal1_subr.c optional atm_uni atm_core -netatm/uni/sscf_uni.c optional atm_uni atm_core -netatm/uni/sscf_uni_lower.c optional atm_uni atm_core -netatm/uni/sscf_uni_upper.c optional atm_uni atm_core -netatm/uni/sscop.c optional atm_uni atm_core -netatm/uni/sscop_lower.c optional atm_uni atm_core -netatm/uni/sscop_pdu.c optional atm_uni atm_core -netatm/uni/sscop_sigaa.c optional atm_uni atm_core -netatm/uni/sscop_sigcpcs.c optional atm_uni atm_core -netatm/uni/sscop_subr.c optional atm_uni atm_core -netatm/uni/sscop_timer.c optional atm_uni atm_core -netatm/uni/sscop_upper.c optional atm_uni atm_core -netatm/uni/uni_load.c optional atm_uni atm_core -netatm/uni/uniarp.c optional atm_uni atm_core -netatm/uni/uniarp_cache.c optional atm_uni atm_core -netatm/uni/uniarp_input.c optional atm_uni atm_core -netatm/uni/uniarp_output.c optional atm_uni atm_core -netatm/uni/uniarp_timer.c optional atm_uni atm_core -netatm/uni/uniarp_vcm.c optional atm_uni atm_core -netatm/uni/uniip.c optional atm_uni atm_core -netatm/uni/unisig_decode.c optional atm_uni atm_core -netatm/uni/unisig_encode.c optional atm_uni atm_core -netatm/uni/unisig_if.c optional atm_uni atm_core -netatm/uni/unisig_mbuf.c optional atm_uni atm_core -netatm/uni/unisig_msg.c optional atm_uni atm_core -netatm/uni/unisig_print.c optional atm_uni atm_core -netatm/uni/unisig_proto.c optional atm_uni atm_core -netatm/uni/unisig_sigmgr_state.c optional atm_uni atm_core -netatm/uni/unisig_subr.c optional atm_uni atm_core -netatm/uni/unisig_util.c optional atm_uni atm_core -netatm/uni/unisig_vc_state.c optional atm_uni atm_core -netgraph/atm/atmpif/ng_atmpif.c optional netgraph_atm_atmpif -netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif +# +# netatm has been disconnected from the build until it is MPSAFE, or +# alternatively, until it is removed. +# +#netatm/atm_aal5.c optional atm_core +#netatm/atm_cm.c optional atm_core +#netatm/atm_device.c optional atm_core +#netatm/atm_if.c optional atm_core +#netatm/atm_proto.c optional atm_core +#netatm/atm_signal.c optional atm_core +#netatm/atm_socket.c optional atm_core +#netatm/atm_subr.c optional atm_core +#netatm/atm_usrreq.c optional atm_core +#netatm/ipatm/ipatm_event.c optional atm_ip atm_core +#netatm/ipatm/ipatm_if.c optional atm_ip atm_core +#netatm/ipatm/ipatm_input.c optional atm_ip atm_core +#netatm/ipatm/ipatm_load.c optional atm_ip atm_core +#netatm/ipatm/ipatm_output.c optional atm_ip atm_core +#netatm/ipatm/ipatm_usrreq.c optional atm_ip atm_core +#netatm/ipatm/ipatm_vcm.c optional atm_ip atm_core +#netatm/sigpvc/sigpvc_if.c optional atm_sigpvc atm_core +#netatm/sigpvc/sigpvc_subr.c optional atm_sigpvc atm_core +#netatm/spans/spans_arp.c optional atm_spans atm_core \ +# dependency "spans_xdr.h" +#netatm/spans/spans_cls.c optional atm_spans atm_core +#netatm/spans/spans_if.c optional atm_spans atm_core +#netatm/spans/spans_kxdr.c optional atm_spans atm_core +#netatm/spans/spans_msg.c optional atm_spans atm_core +#netatm/spans/spans_print.c optional atm_spans atm_core +#netatm/spans/spans_proto.c optional atm_spans atm_core +#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 +#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 +#spans_xdr.o optional atm_spans atm_core \ +# 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 +#netatm/uni/q2110_sigcpcs.c optional atm_uni atm_core +#netatm/uni/q2110_subr.c optional atm_uni atm_core +#netatm/uni/qsaal1_sigaa.c optional atm_uni atm_core +#netatm/uni/qsaal1_sigcpcs.c optional atm_uni atm_core +#netatm/uni/qsaal1_subr.c optional atm_uni atm_core +#netatm/uni/sscf_uni.c optional atm_uni atm_core +#netatm/uni/sscf_uni_lower.c optional atm_uni atm_core +#netatm/uni/sscf_uni_upper.c optional atm_uni atm_core +#netatm/uni/sscop.c optional atm_uni atm_core +#netatm/uni/sscop_lower.c optional atm_uni atm_core +#netatm/uni/sscop_pdu.c optional atm_uni atm_core +#netatm/uni/sscop_sigaa.c optional atm_uni atm_core +#netatm/uni/sscop_sigcpcs.c optional atm_uni atm_core +#netatm/uni/sscop_subr.c optional atm_uni atm_core +#netatm/uni/sscop_timer.c optional atm_uni atm_core +#netatm/uni/sscop_upper.c optional atm_uni atm_core +#netatm/uni/uni_load.c optional atm_uni atm_core +#netatm/uni/uniarp.c optional atm_uni atm_core +#netatm/uni/uniarp_cache.c optional atm_uni atm_core +#netatm/uni/uniarp_input.c optional atm_uni atm_core +#netatm/uni/uniarp_output.c optional atm_uni atm_core +#netatm/uni/uniarp_timer.c optional atm_uni atm_core +#netatm/uni/uniarp_vcm.c optional atm_uni atm_core +#netatm/uni/uniip.c optional atm_uni atm_core +#netatm/uni/unisig_decode.c optional atm_uni atm_core +#netatm/uni/unisig_encode.c optional atm_uni atm_core +#netatm/uni/unisig_if.c optional atm_uni atm_core +#netatm/uni/unisig_mbuf.c optional atm_uni atm_core +#netatm/uni/unisig_msg.c optional atm_uni atm_core +#netatm/uni/unisig_print.c optional atm_uni atm_core +#netatm/uni/unisig_proto.c optional atm_uni atm_core +#netatm/uni/unisig_sigmgr_state.c optional atm_uni atm_core +#netatm/uni/unisig_subr.c optional atm_uni atm_core +#netatm/uni/unisig_util.c optional atm_uni atm_core +#netatm/uni/unisig_vc_state.c optional atm_uni atm_core +#netgraph/atm/atmpif/ng_atmpif.c optional netgraph_atm_atmpif +#netgraph/atm/atmpif/ng_atmpif_harp.c optional netgraph_atm_atmpif netgraph/atm/ccatm/ng_ccatm.c optional ngatm_ccatm \ compile-with "${NORMAL_C} -I$S/contrib/ngatm" netgraph/atm/ng_atm.c optional ngatm_atm @@ -1825,11 +1842,12 @@ 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_fw2.c optional ipfirewall \ + compile-with "${NORMAL_C} -I$S/contrib/pf" netinet/ip_fw_pfil.c optional ipfirewall netinet/ip_icmp.c optional inet netinet/ip_input.c optional inet -netinet/ip_ipsec.c optional fast_ipsec +netinet/ip_ipsec.c optional ipsec netinet/ip_mroute.c optional mrouting inet | mrouting inet6 netinet/ip_options.c optional inet netinet/ip_output.c optional inet @@ -1837,6 +1855,7 @@ netinet/sctp_asconf.c optional inet inet6 sctp netinet/sctp_auth.c optional inet inet6 sctp netinet/sctp_bsd_addr.c optional inet inet6 sctp +netinet/sctp_cc_functions.c optional inet inet6 sctp netinet/sctp_crc32.c optional inet inet6 sctp netinet/sctp_indata.c optional inet inet6 sctp netinet/sctp_input.c optional inet inet6 sctp @@ -1880,7 +1899,7 @@ netinet6/ip6_input.c optional inet6 netinet6/ip6_mroute.c optional mrouting inet6 netinet6/ip6_output.c optional inet6 -netinet6/ip6_ipsec.c optional fast_ipsec +netinet6/ip6_ipsec.c optional inet6 ipsec netinet6/mld6.c optional inet6 netinet6/nd6.c optional inet6 netinet6/nd6_nbr.c optional inet6 @@ -1891,18 +1910,18 @@ netinet6/sctp6_usrreq.c optional inet6 sctp netinet6/udp6_output.c optional inet6 netinet6/udp6_usrreq.c optional inet6 -netipsec/ipsec.c optional fast_ipsec -netipsec/ipsec_input.c optional fast_ipsec -netipsec/ipsec_mbuf.c optional fast_ipsec -netipsec/ipsec_output.c optional fast_ipsec -netipsec/key.c optional fast_ipsec -netipsec/key_debug.c optional fast_ipsec -netipsec/keysock.c optional fast_ipsec -netipsec/xform_ah.c optional fast_ipsec -netipsec/xform_esp.c optional fast_ipsec -netipsec/xform_ipcomp.c optional fast_ipsec -netipsec/xform_ipip.c optional fast_ipsec -netipsec/xform_tcp.c optional fast_ipsec tcp_signature +netipsec/ipsec.c optional ipsec +netipsec/ipsec_input.c optional ipsec +netipsec/ipsec_mbuf.c optional ipsec +netipsec/ipsec_output.c optional ipsec +netipsec/key.c optional ipsec +netipsec/key_debug.c optional ipsec +netipsec/keysock.c optional ipsec +netipsec/xform_ah.c optional ipsec +netipsec/xform_esp.c optional ipsec +netipsec/xform_ipcomp.c optional ipsec +netipsec/xform_ipip.c optional ipsec +netipsec/xform_tcp.c optional ipsec tcp_signature netipx/ipx.c optional ipx netipx/ipx_cksum.c optional ipx netipx/ipx_input.c optional ipx @@ -1959,7 +1978,7 @@ nfsserver/nfs_srvsubs.c optional nfsserver nfsserver/nfs_syscalls.c optional nfsserver # crypto support -opencrypto/cast.c optional crypto | ipsec ipsec_esp +opencrypto/cast.c optional crypto | ipsec opencrypto/criov.c optional crypto opencrypto/crypto.c optional crypto opencrypto/cryptodev.c optional cryptodev ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.amd64#4 (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.104 2007/06/11 00:38:05 marcel Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.106 2007/07/05 06:12:40 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -116,7 +116,7 @@ amd64/amd64/mptable_pci.c optional mptable pci amd64/amd64/msi.c optional pci amd64/amd64/nexus.c standard -amd64/amd64/pmap.c standard +amd64/amd64/pmap.c standard nowerror amd64/amd64/prof_machdep.c optional profiling-routine amd64/amd64/sigtramp.S standard amd64/amd64/support.S standard @@ -135,9 +135,8 @@ amd64/isa/nmi.c standard amd64/pci/pci_bus.c optional pci amd64/pci/pci_cfgreg.c optional pci -crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp -crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \ - netsmb +crypto/blowfish/bf_enc.c optional crypto | ipsec +crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/acpica/acpi_if.m standard dev/arcmsr/arcmsr.c optional arcmsr pci dev/atkbdc/atkbd.c optional atkbd atkbdc ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.arm#2 (text+ko) ==== @@ -1,7 +1,6 @@ -# $FreeBSD: src/sys/conf/files.arm,v 1.14 2006/12/18 05:45:23 mjacob Exp $ -crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp -crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \ - netsmb +# $FreeBSD: src/sys/conf/files.arm,v 1.15 2007/07/03 12:13:42 gnn Exp $ +crypto/blowfish/bf_enc.c optional crypto | ipsec +crypto/des/des_enc.c optional crypto | ipsec | netsmb arm/arm/autoconf.c standard arm/arm/bcopy_page.S standard arm/arm/bcopyinout.S standard ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.i386#4 (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.577 2007/06/11 00:38:05 marcel Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.579 2007/07/05 06:12:40 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -132,11 +132,11 @@ contrib/dev/oltr/trlldbm.c optional oltr contrib/dev/oltr/trlldhm.c optional oltr contrib/dev/oltr/trlldmac.c optional oltr -bf_enc.o optional crypto | ipsec ipsec_esp \ +bf_enc.o optional crypto | ipsec \ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ 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 ipsec_esp | netsmb +crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb crypto/via/padlock.c optional padlock crypto/via/padlock_cipher.c optional padlock crypto/via/padlock_hash.c optional padlock @@ -293,7 +293,7 @@ i386/i386/msi.c optional apic pci i386/i386/nexus.c standard i386/i386/perfmon.c optional perfmon -i386/i386/pmap.c standard +i386/i386/pmap.c standard nowerror i386/i386/ptrace_machdep.c standard i386/i386/support.s standard i386/i386/swtch.s standard ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.ia64#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.ia64,v 1.91 2007/04/09 14:02:18 kan Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.92 2007/07/03 12:13:42 gnn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -42,9 +42,8 @@ contrib/ia64/libuwx/src/uwx_trace.c standard contrib/ia64/libuwx/src/uwx_uinfo.c standard contrib/ia64/libuwx/src/uwx_utable.c standard -crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp -crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \ - netsmb +crypto/blowfish/bf_enc.c optional crypto | ipsec +crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/advansys/adv_isa.c optional adv isa dev/aic/aic_isa.c optional aic isa dev/atkbdc/atkbd.c optional atkbd atkbdc ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.pc98#4 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.355 2007/06/11 00:38:06 marcel Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.356 2007/07/03 12:13:42 gnn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -93,11 +93,11 @@ contrib/dev/oltr/trlldbm.c optional oltr contrib/dev/oltr/trlldhm.c optional oltr contrib/dev/oltr/trlldmac.c optional oltr -bf_enc.o optional crypto | ipsec ipsec_esp \ +bf_enc.o optional crypto | ipsec \ dependency "$S/crypto/blowfish/arch/i386/bf_enc.S $S/crypto/blowfish/arch/i386/bf_enc_586.S $S/crypto/blowfish/arch/i386/bf_enc_686.S" \ 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 ipsec_esp | netsmb +crypto/des/arch/i386/des_enc.S optional crypto | ipsec | netsmb dev/aic/aic_cbus.c optional aic isa dev/ar/if_ar.c optional ar dev/ar/if_ar_pci.c optional ar pci ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.powerpc#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.powerpc,v 1.64 2007/04/06 11:29:52 nyan Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.65 2007/07/03 12:13:42 gnn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -75,8 +75,8 @@ powerpc/powerpc/db_hwwatch.c optional ddb powerpc/powerpc/db_trace.c optional ddb -crypto/blowfish/bf_enc.c optional ipsec ipsec_esp -crypto/des/des_enc.c optional ipsec ipsec_esp | netsmb +crypto/blowfish/bf_enc.c optional crypto | ipsec +crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/ofw/openfirm.c standard dev/ofw/ofw_bus_if.m standard ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.sparc64#4 (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.91 2007/06/18 21:49:42 marius Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.92 2007/07/03 12:13:42 gnn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -32,9 +32,8 @@ no-obj no-implicit-rule before-depend \ clean "opt_ah.h" # -crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp -crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \ - netsmb +crypto/blowfish/bf_enc.c optional crypto | ipsec +crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/atkbdc/atkbd.c optional atkbd atkbdc dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc dev/atkbdc/atkbdc.c optional atkbdc ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/files.sun4v#4 (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.sun4v,v 1.10 2007/06/18 21:49:42 marius Exp $ +# $FreeBSD: src/sys/conf/files.sun4v,v 1.11 2007/07/03 12:13:42 gnn Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -18,9 +18,8 @@ clean "ukbdmap.h" # # -crypto/blowfish/bf_enc.c optional crypto | ipsec ipsec_esp -crypto/des/des_enc.c optional crypto | ipsec ipsec_esp | \ - netsmb +crypto/blowfish/bf_enc.c optional crypto | ipsec +crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/ofw/ofw_bus_if.m standard dev/ofw/ofw_bus_subr.c standard dev/ofw/ofw_console.c optional ofw_console ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/kern.pre.mk#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.83 2007/05/19 04:48:07 kan Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.90 2007/07/12 00:01:53 jfv Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -76,9 +76,6 @@ # .. and the same for twa INCLUDES+= -I$S/dev/twa -# .. and the same for em -INCLUDES+= -I$S/dev/em - # ... and XFS INCLUDES+= -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs @@ -90,7 +87,10 @@ CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} CFLAGS+= --param inline-unit-growth=100 CFLAGS+= --param large-function-growth=1000 -#WERROR?= -Werror +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || \ + ${MACHINE_ARCH} == "sparc64" +WERROR?= -Werror +.endif .endif # XXX LOCORE means "don't declare C stuff" not "for locore.s". ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/kmod.mk#3 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.218 2007/05/19 04:48:08 kan Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.219 2007/07/11 01:20:37 marcel Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -145,12 +145,12 @@ ${_firmw:C/\:.*$/.fwo/}: ${_firmw:C/\:.*$//} @${ECHO} ${_firmw:C/\:.*$//} ${.ALLSRC:M*${_firmw:C/\:.*$//}} @if [ -e ${_firmw:C/\:.*$//} ]; then \ - ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} \ - ${_firmw:C/\:.*$//}; \ + ${LD} -b binary --no-warn-mismatch ${LDFLAGS} \ + -r -d -o ${.TARGET} ${_firmw:C/\:.*$//}; \ else \ ln -s ${.ALLSRC:M*${_firmw:C/\:.*$//}} ${_firmw:C/\:.*$//}; \ - ${LD} -b binary ${LDFLAGS} -r -d -o ${.TARGET} \ - ${_firmw:C/\:.*$//}; \ + ${LD} -b binary --no-warn-mismatch ${LDFLAGS} \ + -r -d -o ${.TARGET} ${_firmw:C/\:.*$//}; \ rm ${_firmw:C/\:.*$//}; \ fi ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/conf/options#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.597 2007/06/25 05:06:55 rafan Exp $ +# $FreeBSD: src/sys/conf/options,v 1.602 2007/07/14 21:49:23 rwatson Exp $ # # On the handling of kernel options # @@ -358,10 +358,8 @@ INET opt_inet.h INET6 opt_inet6.h IPSEC opt_ipsec.h -IPSEC_ESP opt_ipsec.h IPSEC_DEBUG opt_ipsec.h IPSEC_FILTERGIF opt_ipsec.h -FAST_IPSEC opt_ipsec.h IPDIVERT DUMMYNET opt_ipdn.h IPFILTER opt_ipfilter.h @@ -398,7 +396,6 @@ # SCTP opt_sctp.h SCTP_DEBUG opt_sctp.h # Enable debug printfs -SCTP_HIGH_SPEED opt_sctp.h # Enable Sally Floyds HS TCP CC SCTP_WITH_NO_CSUM opt_sctp.h # Use this at your peril SCTP_LOCK_LOGGING opt_sctp.h # Log to KTR lock activity SCTP_MBUF_LOGGING opt_sctp.h # Log to KTR general mbuf aloc/free @@ -483,12 +480,12 @@ TI_PRIVATE_JUMBOS opt_ti.h TI_JUMBO_HDRSPLIT opt_ti.h -# ATM (HARP version) -ATM_CORE opt_atm.h -ATM_IP opt_atm.h -ATM_SIGPVC opt_atm.h -ATM_SPANS opt_atm.h -ATM_UNI opt_atm.h +# ATM (HARP version) - disabled as not MPSAFE in 7.0 +#ATM_CORE opt_atm.h +#ATM_IP opt_atm.h +#ATM_SIGPVC opt_atm.h +#ATM_SPANS opt_atm.h +#ATM_UNI opt_atm.h # XXX Conflict: # of devices vs network protocol (Native ATM). # This makes "atm.h" unusable. @@ -540,6 +537,7 @@ MUTEX_NOINLINE opt_global.h LOCK_PROFILING opt_global.h LOCK_PROFILING_FAST opt_global.h +LOCK_PROFILING_SHARED opt_global.h MSIZE opt_global.h REGRESSION opt_global.h RESTARTABLE_PANICS opt_global.h @@ -733,9 +731,9 @@ NI4BTRC opt_i4b.h NI4BRBCH opt_i4b.h NI4BTEL opt_i4b.h -NI4BIPR opt_i4b.h -NI4BING opt_i4b.h -NI4BISPPP opt_i4b.h +#XXXBZ#NI4BIPR opt_i4b.h >>> TRUNCATED FOR MAIL (1000 lines) <<<