[patch, -rc6] x86_64: UP build fix, arch/x86_64/kernel/mce_amd.c

[patch, -rc6] x86_64: UP build fix, arch/x86_64/kernel/mce_amd.c

[Ingo Molnar]

Subject: [patch] x86_64: UP build fix, arch/x86_64/kernel/mce_amd.c
From: Ingo Molnar <mingo@elte.hu>

fix x86_64/kernel/mce_amd.c build bug:

 arch/x86_64/kernel/mce_amd.c: In function ‘threshold_remove_bank’:
 arch/x86_64/kernel/mce_amd.c:597: error: ‘shared_bank’ undeclared (first use in this function)
 arch/x86_64/kernel/mce_amd.c:597: error: (Each undeclared identifier is reported only once
 arch/x86_64/kernel/mce_amd.c:597: error: for each function it appears in.)
 make[1]: *** [arch/x86_64/kernel/mce_amd.o] Error 1
 make: *** [arch/x86_64/kernel/mce_amd.o] Error 2

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/x86_64/kernel/mce_amd.c |    2 ++
 1 file changed, 2 insertions(+)

Index: linux/arch/x86_64/kernel/mce_amd.c
===================================================================
--- linux.orig/arch/x86_64/kernel/mce_amd.c
+++ linux/arch/x86_64/kernel/mce_amd.c
@@ -593,12 +593,14 @@ static void threshold_remove_bank(unsign
 
 	sprintf(name, "threshold_bank%i", bank);
 
+#ifdef CONFIG_SMP
 	/* sibling symlink */
 	if (shared_bank[bank] && b->blocks->cpu != cpu) {
 		sysfs_remove_link(&per_cpu(device_mce, cpu).kobj, name);
 		per_cpu(threshold_banks, cpu)[bank] = NULL;
 		return;
 	}
+#endif
 
 	/* remove all sibling symlinks before unregistering */
 	for_each_cpu_mask(i, b->cpus) {

Re: [patch, -rc6] x86_64: UP build fix, arch/x86_64/kernel/mce_amd.c

[Andi Kleen]

On Thursday 16 November 2006 11:21, Ingo Molnar wrote:
> Subject: [patch] x86_64: UP build fix, arch/x86_64/kernel/mce_amd.c
> From: Ingo Molnar <mingo@elte.hu>
> 
> fix x86_64/kernel/mce_amd.c build bug:
> 
>  arch/x86_64/kernel/mce_amd.c: In function ‘threshold_remove_bank’:
>  arch/x86_64/kernel/mce_amd.c:597: error: ‘shared_bank’ undeclared (first use in this function)
>  arch/x86_64/kernel/mce_amd.c:597: error: (Each undeclared identifier is reported only once
>  arch/x86_64/kernel/mce_amd.c:597: error: for each function it appears in.)
>  make[1]: *** [arch/x86_64/kernel/mce_amd.o] Error 1
>  make: *** [arch/x86_64/kernel/mce_amd.o] Error 2
> 
> Signed-off-by: Ingo Molnar <mingo@elte.hu>


Hmm, it builds for me.

% grep SMP .config
CONFIG_BROKEN_ON_SMP=y
# CONFIG_X86_VSMP is not set
# CONFIG_SMP is not set
% grep MCE_AMD .config
CONFIG_X86_MCE_AMD=y
% ls -l vmlinux 
-rwxr-xr-x  1 andi users 9174494 2006-11-16 10:20 vmlinux

(basically just defconfig with CONFIG_SMP disabled) 

Perhaps a include ordering problem?  Can you send your .config?

-Andi

Re: [patch, -rc6] x86_64: UP build fix, arch/x86_64/kernel/mce_amd.c

[Ingo Molnar]

* Andi Kleen <ak@suse.de> wrote:

> >  arch/x86_64/kernel/mce_amd.c: In function ‘threshold_remove_bank’:
> >  arch/x86_64/kernel/mce_amd.c:597: error: ‘shared_bank’ undeclared (first use in this function)
> >  arch/x86_64/kernel/mce_amd.c:597: error: (Each undeclared identifier is reported only once
> >  arch/x86_64/kernel/mce_amd.c:597: error: for each function it appears in.)
> >  make[1]: *** [arch/x86_64/kernel/mce_amd.o] Error 1
> >  make: *** [arch/x86_64/kernel/mce_amd.o] Error 2
> > 
> > Signed-off-by: Ingo Molnar <mingo@elte.hu>
> 
> Hmm, it builds for me.

sorry - this is ontop of:

Subject: [patch] hotplug CPU: clean up hotcpu_notifier() use

	Ingo