param.c no longer gets special treatment. Use the source tree version.

6 files changed, 29 insertions, 63 deletions

diff --git a/sys/conf/Makefile.alpha b/sys/conf/Makefile.alpha
index 64aacaf..6f2a2eb 100644
--- a/sys/conf/Makefile.alpha
+++ b/sys/conf/Makefile.alpha
@@ -88,10 +88,10 @@ NORMAL_M= perl5 $S/kern/makeobjops.pl -c $<; \
 	  ${CC} -c ${CFLAGS} ${PROF} ${.PREFIX}.c
 
 GEN_CFILES= $S/$M/$M/genassym.c
-SYSTEM_CFILES= param.c vnode_if.c hints.c config.c
+SYSTEM_CFILES= vnode_if.c hints.c config.c
 SYSTEM_SFILES= $S/$M/$M/locore.s
 SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
-SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} param.o hints.o config.o hack.So
+SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} hints.o config.o hack.So
 SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \
 	-e locorestart \
 	-export-dynamic -dynamic-linker /red/herring \
@@ -150,7 +150,7 @@ ${mfile:T:S/.m$/.h/}: ${mfile}
 
 kernel-clean:
 	rm -f *.o *.so *.So *.ko *.s eddep errs \
-	      ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks param.c \
+	      ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks \
 	      setdef[01].c setdefs.h tags \
 	      vers.c vnode_if.c vnode_if.h \
 	      ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \
@@ -159,9 +159,9 @@ kernel-clean:
 kernel-clobber:
 	find . -type f ! -name version -delete
 
-#lint: /tmp param.c
+#lint: /tmp
 #	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} \
-#	  $S/$M/$M/Locore.c ${CFILES} param.c | \
+#	  $S/$M/$M/Locore.c ${CFILES} | \
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
@@ -237,7 +237,7 @@ kernel-depend:
 	if [ -f .depend ]; then mv .depend .olddep; fi
 	${MAKE} _kernel-depend
 
-_kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
+_kernel-depend: assym.s vnode_if.h ${BEFORE_DEPEND} \
 	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
 	    ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/}
 	if [ -f .olddep ]; then mv .olddep .depend; fi
@@ -349,13 +349,6 @@ modules-reinstall modules-reinstall.debug:
 config.o:
 	${NORMAL_C}
 
-param.c: $S/conf/param.c
-	-rm -f param.c
-	cp $S/conf/param.c .
-
-param.o:
-	${NORMAL_C}
-
 vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 
diff --git a/sys/conf/Makefile.i386 b/sys/conf/Makefile.i386
index f3e936b..7465db0 100644
--- a/sys/conf/Makefile.i386
+++ b/sys/conf/Makefile.i386
@@ -91,10 +91,10 @@ NORMAL_M= perl5 $S/kern/makeobjops.pl -c $<; \
 	  ${CC} -c ${CFLAGS} ${PROF} ${.PREFIX}.c
 
 GEN_CFILES= $S/$M/$M/genassym.c
-SYSTEM_CFILES= param.c vnode_if.c hints.c config.c
+SYSTEM_CFILES= vnode_if.c hints.c config.c
 SYSTEM_SFILES= $S/$M/$M/locore.s
 SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
-SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} param.o hints.o config.o hack.So
+SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} hints.o config.o hack.So
 SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
@@ -153,7 +153,7 @@ ${mfile:T:S/.m$/.h/}: ${mfile}
 
 kernel-clean:
 	rm -f *.o *.so *.So *.ko *.s eddep errs \
-	      ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks param.c \
+	      ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks \
 	      setdef[01].c setdefs.h tags \
 	      vers.c vnode_if.c vnode_if.h \
 	      ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \
@@ -162,9 +162,9 @@ kernel-clean:
 kernel-clobber:
 	find . -type f ! -name version -delete
 
-#lint: /tmp param.c
+#lint: /tmp
 #	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} \
-#	  $S/$M/$M/Locore.c ${CFILES} param.c | \
+#	  $S/$M/$M/Locore.c ${CFILES} | \
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
@@ -195,7 +195,7 @@ kernel-depend:
 	if [ -f .depend ]; then mv .depend .olddep; fi
 	${MAKE} _kernel-depend
 
-_kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
+_kernel-depend: assym.s vnode_if.h ${BEFORE_DEPEND} \
 	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
 	    ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/}
 	if [ -f .olddep ]; then mv .olddep .depend; fi
@@ -307,13 +307,6 @@ modules-reinstall modules-reinstall.debug:
 config.o:
 	${NORMAL_C}
 
-param.c: $S/conf/param.c
-	-rm -f param.c
-	cp $S/conf/param.c .
-
-param.o:
-	${NORMAL_C}
-
 vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64
index 6fa83c4..a4d47bb 100644
--- a/sys/conf/Makefile.ia64
+++ b/sys/conf/Makefile.ia64
@@ -101,10 +101,10 @@ NORMAL_M= perl5 $S/kern/makeobjops.pl -c $<; \
 	  ${CC} -c ${CFLAGS} ${PROF} ${.PREFIX}.c
 
 GEN_CFILES= $S/$M/$M/genassym.c
-SYSTEM_CFILES= param.c vnode_if.c hints.c config.c
+SYSTEM_CFILES= vnode_if.c hints.c config.c
 SYSTEM_SFILES= $S/$M/$M/locore.s
 SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
-SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} param.o hints.o config.o \
+SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} hints.o config.o \
 	# hack.So ski can't cope with dynamic relocs
 SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \
 	-e locorestart \
@@ -164,7 +164,7 @@ ${mfile:T:S/.m$/.h/}: ${mfile}
 
 kernel-clean:
 	rm -f *.o *.so *.So *.ko *.s eddep errs \
-	      ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks param.c \
+	      ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks \
 	      setdef[01].c setdefs.h tags \
 	      vers.c vnode_if.c vnode_if.h \
 	      ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \
@@ -200,7 +200,7 @@ kernel-depend:
 	if [ -f .depend ]; then mv .depend .olddep; fi
 	${MAKE} _kernel-depend
 
-_kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
+_kernel-depend: assym.s vnode_if.h ${BEFORE_DEPEND} \
 	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
 	    ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/}
 	if [ -f .olddep ]; then mv .olddep .depend; fi
@@ -312,13 +312,6 @@ modules-reinstall modules-reinstall.debug:
 config.o:
 	${NORMAL_C}
 
-param.c: $S/conf/param.c
-	-rm -f param.c
-	cp $S/conf/param.c .
-
-param.o:
-	${NORMAL_C}
-
 vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 
diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index a2b7f18..a5312ea 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -93,10 +93,10 @@ NORMAL_M= perl5 $S/kern/makeobjops.pl -c $<; \
 	  ${CC} -c ${CFLAGS} ${PROF} ${.PREFIX}.c
 
 GEN_CFILES= $S/$M/$M/genassym.c
-SYSTEM_CFILES= param.c vnode_if.c hints.c config.c
+SYSTEM_CFILES= vnode_if.c hints.c config.c
 SYSTEM_SFILES= $S/$M/$M/locore.s
 SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
-SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} param.o hints.o config.o hack.So
+SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} hints.o config.o hack.So
 SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
@@ -155,7 +155,7 @@ ${mfile:T:S/.m$/.h/}: ${mfile}
 
 kernel-clean:
 	rm -f *.o *.so *.So *.ko *.s eddep errs \
-	      ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks param.c \
+	      ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks \
 	      setdef[01].c setdefs.h tags \
 	      vers.c vnode_if.c vnode_if.h \
 	      ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \
@@ -164,9 +164,9 @@ kernel-clean:
 kernel-clobber:
 	find . -type f ! -name version -delete
 
-#lint: /tmp param.c
+#lint: /tmp
 #	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} \
-#	  $S/$M/$M/Locore.c ${CFILES} param.c | \
+#	  $S/$M/$M/Locore.c ${CFILES} | \
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
@@ -198,7 +198,7 @@ kernel-depend:
 	if [ -f .depend ]; then mv .depend .olddep; fi
 	${MAKE} _kernel-depend
 
-_kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
+_kernel-depend: assym.s vnode_if.h ${BEFORE_DEPEND} \
 	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
 	    ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/}
 	if [ -f .olddep ]; then mv .olddep .depend; fi
@@ -311,13 +311,6 @@ modules-reinstall modules-reinstall.debug:
 config.o:
 	${NORMAL_C}
 
-param.c: $S/conf/param.c
-	-rm -f param.c
-	cp $S/conf/param.c .
-
-param.o:
-	${NORMAL_C}
-
 vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 
diff --git a/sys/conf/Makefile.powerpc b/sys/conf/Makefile.powerpc
index a83d870..c7a1d84 100644
--- a/sys/conf/Makefile.powerpc
+++ b/sys/conf/Makefile.powerpc
@@ -94,10 +94,10 @@ NORMAL_M= perl5 $S/kern/makeobjops.pl -c $<; \
 	  ${CC} -c ${CFLAGS} ${PROF} ${.PREFIX}.c
 
 GEN_CFILES= $S/$M/$M/genassym.c
-SYSTEM_CFILES= param.c vnode_if.c hints.c config.c
+SYSTEM_CFILES= vnode_if.c hints.c config.c
 SYSTEM_SFILES= $S/$M/$M/locore.s
 SYSTEM_DEP= Makefile ${SYSTEM_OBJS}
-SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} param.o hints.o config.o hack.So
+SYSTEM_OBJS= locore.o vnode_if.o ${OBJS} hints.o config.o hack.So
 SYSTEM_LD= @${LD} ${FMT} -Bdynamic -T $S/conf/ldscript.$M \
 	-export-dynamic -dynamic-linker /red/herring \
 	-o ${.TARGET} -X ${SYSTEM_OBJS} vers.o
@@ -156,7 +156,7 @@ ${mfile:T:S/.m$/.h/}: ${mfile}
 
 kernel-clean:
 	rm -f *.o *.so *.So *.ko *.s eddep errs \
-	      ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks param.c \
+	      ${FULLKERNEL} ${KERNEL_KO} linterrs makelinks \
 	      setdef[01].c setdefs.h tags \
 	      vers.c vnode_if.c vnode_if.h \
 	      ${MFILES:T:S/.m$/.c/} ${MFILES:T:S/.m$/.h/} \
@@ -165,9 +165,9 @@ kernel-clean:
 kernel-clobber:
 	find . -type f ! -name version -delete
 
-#lint: /tmp param.c
+#lint: /tmp
 #	@lint -hbxn -DGENERIC -Dvolatile= ${COPTS} \
-#	  $S/$M/$M/Locore.c ${CFILES} param.c | \
+#	  $S/$M/$M/Locore.c ${CFILES} | \
 #	    grep -v 'struct/union .* never defined' | \
 #	    grep -v 'possible pointer alignment problem'
 
@@ -198,7 +198,7 @@ kernel-depend:
 	if [ -f .depend ]; then mv .depend .olddep; fi
 	${MAKE} _kernel-depend
 
-_kernel-depend: assym.s param.c vnode_if.h ${BEFORE_DEPEND} \
+_kernel-depend: assym.s vnode_if.h ${BEFORE_DEPEND} \
 	    ${CFILES} ${SYSTEM_CFILES} ${GEN_CFILES} ${SFILES} \
 	    ${SYSTEM_SFILES} ${MFILES:T:S/.m$/.h/}
 	if [ -f .olddep ]; then mv .olddep .depend; fi
@@ -310,13 +310,6 @@ modules-reinstall modules-reinstall.debug:
 config.o:
 	${NORMAL_C}
 
-param.c: $S/conf/param.c
-	-rm -f param.c
-	cp $S/conf/param.c .
-
-param.o:
-	${NORMAL_C}
-
 vers.c: $S/conf/newvers.sh $S/sys/param.h ${SYSTEM_DEP}
 	sh $S/conf/newvers.sh ${KERN_IDENT} ${IDENT}
 
diff --git a/sys/conf/files b/sys/conf/files
index d596ca5..e6aebb2 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -801,6 +801,7 @@ kern/subr_log.c		standard
 kern/subr_mbuf.c	standard
 kern/subr_mchain.c	optional libmchain
 kern/subr_module.c	standard
+kern/subr_param.c	standard
 kern/subr_pcpu.c	standard
 kern/subr_prf.c		standard
 kern/subr_prof.c	standard