From: Jeremy Fitzhardinge Date: Wed, 21 May 2008 10:21:13 +0000 (+0100) Subject: x86: compile error fix for smpboot.c X-Git-Tag: v2.6.27-rc1~1106^2~246^2~7 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f307d25e638d3408659a2ec98fb3fd1737f7cb31;p=linux-2.6-omap-h63xx.git x86: compile error fix for smpboot.c Without this patch, my link fails with: arch/x86/kernel/built-in.o(.cpuinit.text+0x3c6e): In function `get_local_pda': : undefined reference to `_cpu_pda' arch/x86/kernel/built-in.o(.cpuinit.text+0x3cd1): In function `get_local_pda': : undefined reference to `after_bootmem' arch/x86/kernel/built-in.o(.cpuinit.text+0x3cec): In function `get_local_pda': : undefined reference to `_cpu_pda' make[2]: *** [.tmp_vmlinux1] Error 1 Caused by commit 766da892634694f795b18b9538407816896fc470 x86: remove static boot_cpu_pda array v2 Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index bf083348745..bc1e1257e51 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -816,6 +816,7 @@ static void __cpuinit do_fork_idle(struct work_struct *work) complete(&c_idle->done); } +#ifdef CONFIG_X86_64 /* * Allocate node local memory for the AP pda. * @@ -852,6 +853,7 @@ static int __cpuinit get_local_pda(int cpu) cpu_pda(cpu) = newpda; return 0; } +#endif /* CONFIG_X86_64 */ static int __cpuinit do_boot_cpu(int apicid, int cpu) /*