Re: 2.6.6-rc1-mm1 failure: kmod.o didn't compile with module-less setup

[Andrew Morton <akpm@osdl.org>]

Helge Hafting <helgehaf@aitel.hist.no> wrote:
>
> This one zonked out. I haven't configured module support, I simply
> compile a monolithic kernel tailored for this particular machine.
> I got this error, where 2.6.5-mm6 works well:
> 
>   CC      kernel/kmod.o
> kernel/kmod.c: In function `call_usermodehelper':
> kernel/kmod.c:253: error: `khelper_wq' undeclared (first use in this function)
> kernel/kmod.c:253: error: (Each undeclared identifier is reported only once
> kernel/kmod.c:253: error: for each function it appears in.)
> kernel/kmod.c: In function `usermodehelper_init':
> kernel/kmod.c:267: error: `khelper_wq' undeclared (first use in this function)
> make[1]: *** [kernel/kmod.o] Error 1
> make: *** [kernel] Error 2
> 


diff -puN kernel/kmod.c~use-workqueue-for-call_usermodehelper-fix kernel/kmod.c
--- 25/kernel/kmod.c~use-workqueue-for-call_usermodehelper-fix	2004-04-19 01:45:50.561866616 -0700
+++ 25-akpm/kernel/kmod.c	2004-04-19 01:45:56.323990640 -0700
@@ -40,9 +40,10 @@
 
 extern int max_threads;
 
-#ifdef CONFIG_KMOD
 static struct workqueue_struct *khelper_wq;
 
+#ifdef CONFIG_KMOD
+
 /*
 	modprobe_path is set via /proc/sys.
 */

_