Re: 2.6.7-rc2-mm1

[Ari Pollak <ajp@aripollak.com>]

neither this nor andy's patch seems to fix compilation on x86.

AKIYAMA Nobuyuki wrote:
> On Tue, 01 Jun 2004 11:59:23 +0200
> Alexander Gran <alex@zodiac.dnsalias.org> wrote:
> 
> 
>>Am Dienstag, 1. Juni 2004 11:15 schrieben Sie:
>>
>>>ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.7-rc2/2.6
>>>.7-rc2-mm1/
>>
>>>+nmi-trigger-switch-support-for-debugging.patch
>>>
>>> Support NMI-generating front-panel switches on x86
>>
>>Perhaps that broke compiling here:
>>
>>...
>>  UPD     include/linux/compile.h
>>  CC      init/version.o
>>  LD      init/built-in.o
>>  LD      .tmp_vmlinux1
>>kernel/built-in.o(.data+0xc0c): undefined reference to `unknown_nmi_panic'
>>kernel/built-in.o(.data+0xc1c): undefined reference to 
>>`proc_unknown_nmi_panic'
>>make: *** [.tmp_vmlinux1] Error 1
>>
>>config attached, plain 2.6.7-rc2-mm1, only with dsdt patch for my laptop.
> 
> 
> Please try the patch below.
> 
> diff -Nur linux-2.6.7-rc2-mm1.org/kernel/sysctl.c linux-2.6.7-rc2-mm1/kernel/sysctl.c
> --- linux-2.6.7-rc2-mm1.org/kernel/sysctl.c	2004-06-01 19:47:22.000000000 +0900
> +++ linux-2.6.7-rc2-mm1/kernel/sysctl.c	2004-06-01 20:21:13.000000000 +0900
> @@ -63,7 +63,7 @@
>  extern int printk_ratelimit_jiffies;
>  extern int printk_ratelimit_burst;
>  
> -#if defined(__i386__)
> +#ifdef CONFIG_X86
>  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
>  	{
>  		.ctl_name       = KERN_UNKNOWN_NMI_PANIC,
>  		.procname       = "unknown_nmi_panic",
> 
>