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?
Lars
Index: x86_machdep.c
===================================================================
RCS file: /cvsroot/src/sys/arch/x86/x86/x86_machdep.c,v
retrieving revision 1.47
diff -u -p -r1.47 x86_machdep.c
--- x86_machdep.c 26 May 2011 04:25:28 -0000 1.47
+++ x86_machdep.c 26 May 2011 16:09:24 -0000
@@ -36,6 +36,7 @@ __KERNEL_RCSID(0, "$NetBSD: x86_machdep.
#include "opt_modular.h"
#include "opt_physmem.h"
#include "opt_splash.h"
+#include "opt_userconf.h"
#include <sys/types.h>
#include <sys/param.h>
@@ -50,7 +51,10 @@ __KERNEL_RCSID(0, "$NetBSD: x86_machdep.
#include <sys/module.h>
#include <sys/sysctl.h>
#include <sys/extent.h>
+
+#if defined(USERCONF)
#include <sys/userconf.h>
+#endif /* defined(USERCONF) */
#include <x86/cpuvar.h>
#include <x86/cputypes.h>
@@ -178,6 +182,7 @@ module_init_md(void)
}
#endif /* MODULAR */
+#if defined(USERCONF)
void
userconf_bootinfo(void)
{
@@ -197,6 +202,7 @@ userconf_bootinfo(void)
userconf_parse(bi->text);
}
}
+#endif /* defined USERCONF) */
void
cpu_need_resched(struct cpu_info *ci, int flags)
