diff options
| author | Tejun Heo <tj@kernel.org> | 2009-01-16 11:19:03 +0900 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-16 14:20:43 +0100 |
| commit | a338af2c648f5e07c582154745a6c60cd2d8bf12 (patch) | |
| tree | fbfa35fe7672945f11c14f919663ba8b5a3f322e /arch/x86/kernel/setup_percpu.c | |
| parent | 6dbde3530850d4d8bfc1b6bd4006d92786a2787f (diff) | |
| download | op-kernel-dev-a338af2c648f5e07c582154745a6c60cd2d8bf12.zip op-kernel-dev-a338af2c648f5e07c582154745a6c60cd2d8bf12.tar.gz | |
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index daeedf8..b5c35af 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 |
