aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/setup_percpu.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-01-15 21:19:03 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-16 08:20:43 -0500
commita338af2c648f5e07c582154745a6c60cd2d8bf12 (patch)
treefbfa35fe7672945f11c14f919663ba8b5a3f322e /arch/x86/kernel/setup_percpu.c
parent6dbde3530850d4d8bfc1b6bd4006d92786a2787f (diff)
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 <tj@kernel.org>
Diffstat (limited to 'arch/x86/kernel/setup_percpu.c')
-rw-r--r--arch/x86/kernel/setup_percpu.c3
1 files changed, 1 insertions, 2 deletions
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)
86} 86}
87#ifndef CONFIG_SMP 87#ifndef CONFIG_SMP
88DEFINE_PER_CPU(struct x8664_pda, __pda); 88DEFINE_PER_CPU(struct x8664_pda, __pda);
89EXPORT_PER_CPU_SYMBOL(__pda);
90#endif 89#endif
91 90EXPORT_PER_CPU_SYMBOL(__pda);
92#endif /* CONFIG_SMP && CONFIG_X86_64 */ 91#endif /* CONFIG_SMP && CONFIG_X86_64 */
93 92
94#ifdef CONFIG_X86_64 93#ifdef CONFIG_X86_64