projects
/
kernel
/
kernel-generic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6dbde35
)
x86: fix build bug introduced during merge
author
Tejun Heo
<tj@kernel.org>
Fri, 16 Jan 2009 02:19:03 +0000
(11:19 +0900)
committer
Ingo Molnar
<mingo@elte.hu>
Fri, 16 Jan 2009 13:20:43 +0000
(14:20 +0100)
EXPORT_PER_CPU_SYMBOL() got misplaced during merge leading to build
failure. Fix it.
Signed-off-by: Tejun Heo <tj@kernel.org>
arch/x86/kernel/setup_percpu.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/setup_percpu.c
b/arch/x86/kernel/setup_percpu.c
index
daeedf8
..
b5c35af
100644
(file)
--- 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