From: Tejun Heo Date: Fri, 16 Jan 2009 02:19:03 +0000 (+0900) Subject: x86: fix build bug introduced during merge X-Git-Tag: v2.6.30-rc1~2^2~50^2~72 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a338af2c648f5e07c582154745a6c60cd2d8bf12;p=karo-tx-linux.git x86: fix build bug introduced during merge EXPORT_PER_CPU_SYMBOL() got misplaced during merge leading to build failure. Fix it. Signed-off-by: Tejun Heo --- diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index daeedf82c15f..b5c35af2011d 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c @@ -86,9 +86,8 @@ void __cpuinit load_pda_offset(int cpu) } #ifndef CONFIG_SMP DEFINE_PER_CPU(struct x8664_pda, __pda); -EXPORT_PER_CPU_SYMBOL(__pda); #endif - +EXPORT_PER_CPU_SYMBOL(__pda); #endif /* CONFIG_SMP && CONFIG_X86_64 */ #ifdef CONFIG_X86_64