瀏覽代碼

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>
Tejun Heo 16 年之前
父節點
當前提交
a338af2c64
共有 1 個文件被更改,包括 1 次插入2 次删除
  1. 1 2
      arch/x86/kernel/setup_percpu.c

+ 1 - 2
arch/x86/kernel/setup_percpu.c

@@ -86,9 +86,8 @@ void __cpuinit load_pda_offset(int cpu)
 }
 }
 #ifndef CONFIG_SMP
 #ifndef CONFIG_SMP
 DEFINE_PER_CPU(struct x8664_pda, __pda);
 DEFINE_PER_CPU(struct x8664_pda, __pda);
-EXPORT_PER_CPU_SYMBOL(__pda);
 #endif
 #endif
-
+EXPORT_PER_CPU_SYMBOL(__pda);
 #endif /* CONFIG_SMP && CONFIG_X86_64 */
 #endif /* CONFIG_SMP && CONFIG_X86_64 */
 
 
 #ifdef CONFIG_X86_64
 #ifdef CONFIG_X86_64