Andi,

If CONFIG_SYCTL is not enabled then the x86-64 tree
fails to build due to use of a symbol that is not 
compiled in.  Don't bother compiling in the sysctl
register call if not building with sysctl.  

matt

Signed-off-by: Matt Tolentino <[EMAIL PROTECTED]>


diff -urNp linux-2.6.12-rc2/arch/x86_64/kernel/vsyscall.c 
linux-2.6.12-rc2-m/arch/x86_64/kernel/vsyscall.c
--- linux-2.6.12-rc2/arch/x86_64/kernel/vsyscall.c      2005-04-04 
12:39:06.000000000 -0400
+++ linux-2.6.12-rc2-m/arch/x86_64/kernel/vsyscall.c    2005-04-13 
09:28:47.000000000 -0400
@@ -218,7 +218,9 @@ static int __init vsyscall_init(void)
        BUG_ON((VSYSCALL_ADDR(0) != __fix_to_virt(VSYSCALL_FIRST_PAGE)));
        map_vsyscall();
        sysctl_vsyscall = 1;
+#ifdef CONFIG_SYSCTL
        register_sysctl_table(kernel_root_table2, 0);
+#endif
        return 0;
 }
 
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to