Re: [PATCH 5/24] smp x86 consolidation

[Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org>]

* Glauber de Oliveira Costa <gcosta-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:

> > I'm getting link errors in 32-bit:
> > 
> > arch/x86/kernel/built-in.o: In function `native_smp_send_reschedule':
> > /home/jeremy/hg/xen/paravirt/linux/arch/x86/kernel/smpcommon.c:262: undefined reference to `genapic'
> > arch/x86/kernel/built-in.o: In function `native_smp_call_function_mask':
> > /home/jeremy/hg/xen/paravirt/linux/arch/x86/kernel/smpcommon.c:113: undefined reference to `genapic'
> > 
> Ok, it compiled just fine here. I bet it's due to  one of that i386 lots
> of variants.

this patch is causing build failures all around the place. It does not 
build on CONFIG_X86_SUMMIT, it does not build if CONFIG_X86_GENERICARCH 
is turned off, etc. It does not even build on UP - fix for that is 
attached below. I've dropped this patch for now.

	Ingo

-------------->
Subject: x86: fix build error
From: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org>

fix build error on !CONFIG_SMP.

Signed-off-by: Ingo Molnar <mingo-X9Un+BFzKDI@public.gmane.org>
Signed-off-by: Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
---
 include/asm-x86/smp.h |    2 ++
 1 file changed, 2 insertions(+)

Index: linux/include/asm-x86/smp.h
===================================================================
--- linux.orig/include/asm-x86/smp.h
+++ linux/include/asm-x86/smp.h
@@ -2,6 +2,7 @@
 #define _X86_SMP_H_
 
 #ifndef __ASSEMBLY__
+#ifdef CONFIG_SMP
 struct smp_ops
 {
 	void (*smp_prepare_boot_cpu)(void);
@@ -55,6 +56,7 @@ void native_smp_prepare_boot_cpu(void);
 void native_smp_prepare_cpus(unsigned int max_cpus);
 int native_cpu_up(unsigned int cpunum);
 void native_smp_cpus_done(unsigned int max_cpus);
+#endif
 
 #ifndef CONFIG_PARAVIRT
 #define startup_ipi_hook(phys_apicid, start_eip, start_esp) 		\

-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/