On Thu, May 26, 2011 at 06:10:42PM +0200, Lars Heidieker wrote: > On 05/26/11 06:25, Masao Uebayashi wrote: > > Module Name: src > > Committed By: uebayasi > > Date: Thu May 26 04:25:28 UTC 2011 > > > > Modified Files: > > src/share/man/man5: boot.cfg.5 > > src/share/man/man8/man8.i386: boot.8 > > src/sys/arch/i386/stand/boot: boot2.c > > src/sys/arch/i386/stand/lib: bootmenu.c exec.c libi386.h > > src/sys/arch/i386/stand/pxeboot: main.c > > src/sys/arch/x86/include: bootinfo.h cpu.h > > src/sys/arch/x86/x86: x86_machdep.c > > src/sys/kern: init_main.c subr_userconf.c > > src/sys/sys: userconf.h > > > > Log Message: > > Support userconf(4) command in boot(8)/boot.cfg(5) on i386/amd64. > > > >>From jmmv@, no objections seen in the proposed thread: > > > > http://mail-index.netbsd.org/tech-kern/2009/01/22/msg004081.html > > > > > > Hi, > > with those changes I can't compile a kernel without USERCONF option set. > The changes in x86_machdep.c should be with in if defs on that options > > Ok to commit the attached patch?
Conditional compilation clutters the code up. What if instead you add to kern_stub.c, #include <sys/userconf.h> __weak_alias(userconf_bootinfo, voidop); ? Dave -- David Young OJC Technologies dyo...@ojctech.com Urbana, IL * (217) 344-0444 x24