PERFORCE change 144840 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=144840

Change 144840 by sam at sam_ebb on 2008/07/07 17:54:39

	IFC @ 144838

Affected files ...

.. //depot/projects/vap/sys/conf/files#44 integrate
.. //depot/projects/vap/sys/conf/kern.pre.mk#9 integrate

Differences ...

==== //depot/projects/vap/sys/conf/files#44 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1310 2008/06/20 19:28:33 delphij Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1314 2008/07/04 21:24:35 jhb Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -514,7 +514,6 @@
 dev/cm/smc90cx6.c		optional cm
 dev/cmx/cmx.c			optional cmx
 dev/cmx/cmx_pccard.c		optional cmx pccard
-dev/cnw/if_cnw.c		optional cnw pccard
 dev/cpufreq/ichss.c		optional cpufreq
 dev/cs/if_cs.c			optional cs
 dev/cs/if_cs_isa.c		optional cs isa
@@ -1093,7 +1092,6 @@
 dev/rp/rp_isa.c			optional rp isa
 dev/rp/rp_pci.c			optional rp pci
 dev/safe/safe.c			optional safe
-dev/sbsh/if_sbsh.c		optional sbsh
 dev/scc/scc_if.m		optional scc
 dev/scc/scc_bfe_ebus.c		optional scc ebus
 dev/scc/scc_bfe_quicc.c		optional scc quicc
@@ -1618,6 +1616,8 @@
 kern/sched_4bsd.c		optional sched_4bsd
 kern/sched_ule.c		optional sched_ule
 kern/serdev_if.m		standard
+kern/stack_protector.c		standard \
+	compile-with "${NORMAL_C:N-fstack-protector*}"
 kern/subr_acl_posix1e.c		standard
 kern/subr_autoconf.c		standard
 kern/subr_blist.c		standard
@@ -2067,6 +2067,7 @@
 nfsserver/nfs_srvcache.c	optional nfsserver
 nfsserver/nfs_srvsubs.c		optional nfsserver
 nfsserver/nfs_syscalls.c	optional nfsserver
+nlm/nlm_advlock.c		optional nfslockd
 nlm/nlm_prot_clnt.c		optional nfslockd
 nlm/nlm_prot_impl.c		optional nfslockd
 nlm/nlm_prot_server.c		optional nfslockd

==== //depot/projects/vap/sys/conf/kern.pre.mk#9 (text+ko) ====

@@ -1,12 +1,9 @@
-# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.99 2008/06/09 06:31:17 jb Exp $
+# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.100 2008/06/25 21:33:28 ru Exp $
 
 # Part of a unified Makefile for building kernels.  This part contains all
 # of the definitions that need to be before %BEFORE_DEPEND.
 
-SRCCONF?=	/etc/src.conf
-.if exists(${SRCCONF})
-.include "${SRCCONF}"
-.endif
+.include <bsd.own.mk>
 
 # Can be overridden by makeoptions or /etc/make.conf
 KERNEL_KO?=	kernel