提交 872fb6dd 编写于 作者: F Fenghua Yu 提交者: Tejun Heo

ia64: Fix setup_per_cpu_areas() compilation error

Fix ia64 build setup_per_cpu_areas() redifinition issue in UP
configuration.  When compiling ia64 kernel in UP configuration, the
following compilation errors are reported:

arch/ia64/kernel/setup.c:860: error: redefinition of 'setup_per_cpu_areas'
include/linux/percpu.h:185: error: previous definition of 'setup_per_cpu_areas' was here

The patch fixes the issue in arch/ia64/kernel/setup.c
Signed-off-by: NFenghua Yu <fenghua.yu@intel.com>
Signed-off-by: NTejun Heo <tj@kernel.org>
上级 023bf6f1
...@@ -855,11 +855,17 @@ identify_cpu (struct cpuinfo_ia64 *c) ...@@ -855,11 +855,17 @@ identify_cpu (struct cpuinfo_ia64 *c)
c->unimpl_pa_mask = ~((1L<<63) | ((1L << phys_addr_size) - 1)); c->unimpl_pa_mask = ~((1L<<63) | ((1L << phys_addr_size) - 1));
} }
/*
* In UP configuration, setup_per_cpu_areas() is defined in
* include/linux/percpu.h
*/
#ifdef CONFIG_SMP
void __init void __init
setup_per_cpu_areas (void) setup_per_cpu_areas (void)
{ {
/* start_kernel() requires this... */ /* start_kernel() requires this... */
} }
#endif
/* /*
* Do the following calculations: * Do the following calculations:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册