Module Name: src
Committed By: dyoung
Date: Tue May 31 23:28:53 UTC 2011
Modified Files:
src/sys/arch/x86/conf: files.x86
src/sys/arch/x86/include: cpu.h
src/sys/arch/x86/x86: x86_machdep.c
src/sys/kern: init_main.c kern_stub.c subr_userconf.c
src/sys/sys: userconf.h
Added Files:
src/sys/arch/x86/x86: x86_userconf.c
Log Message:
Don't use the C preprocessor to configure USERCONF. Instead, either do
or do not link in subr_userconf.c and x86_userconf.c.
Provide no-op stubs for userconf_bootinfo(), userconf_init(), and
userconf_prompt().
Delete all occurrences of #include "opt_userconf.h" as well as USERCONF
and __HAVE_USERCONF_BOOTINFO #ifdef'age.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/x86/conf/files.x86
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/x86/include/cpu.h
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/x86/x86/x86_machdep.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/x86/x86_userconf.c
cvs rdiff -u -r1.430 -r1.431 src/sys/kern/init_main.c
cvs rdiff -u -r1.31 -r1.32 src/sys/kern/kern_stub.c
cvs rdiff -u -r1.23 -r1.24 src/sys/kern/subr_userconf.c
cvs rdiff -u -r1.6 -r1.7 src/sys/sys/userconf.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
