Re: 2.6.7-rc2-mm1

[Andy Lutomirski <luto@myrealbox.com>]

[-- Attachment #1: Type: text/plain, Size: 332 bytes --]

Andrew Morton wrote:

> 
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.7-rc2/2.6.7-rc2-mm1/
> 

This doesn't compile for me on x86 without local apic.  Something like this 
seems to fix it.  (Dunno if it's the right fix, and sorry about the 
attached patch -- I'm too tired to use a different mailer.)

--Andy

[-- Attachment #2: nmifix.patch --]
[-- Type: text/plain, Size: 774 bytes --]

Signed-off-by: Andy Lutomirski <luto@myrealbox.com>

 sysctl.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- 2.6.7-rc2-mm1/kernel/sysctl.c~nmifix	2004-06-01 04:20:07.000000000 -0700
+++ 2.6.7-rc2-mm1/kernel/sysctl.c	2004-06-01 04:21:40.000000000 -0700
@@ -63,7 +63,7 @@
 extern int printk_ratelimit_jiffies;
 extern int printk_ratelimit_burst;
 
-#if defined(__i386__)
+#ifdef CONFIG_X86_LOCAL_APIC
 extern int unknown_nmi_panic;
 extern int proc_unknown_nmi_panic(ctl_table *, int, struct file *,
 				  void __user *, size_t *);
@@ -624,7 +624,7 @@
 		.mode		= 0444,
 		.proc_handler	= &proc_dointvec,
 	},
-#if defined(__i386__)
+#ifdef CONFIG_X86_LOCAL_APIC
 	{
 		.ctl_name       = KERN_UNKNOWN_NMI_PANIC,
 		.procname       = "unknown_nmi_panic",