diff options
| author | Fenghua Yu <fenghua.yu@intel.com> | 2009-07-13 22:09:43 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2009-07-15 04:46:34 +0200 |
| commit | 872fb6dd6b07986417964e089074e7acfd025f4c (patch) | |
| tree | 6d3de5b54db0a61fc09f7864a4b4d75ddef8f7a7 /arch/ia64/kernel/setup.c | |
| parent | linker script: unify usage of discard definition (diff) | |
| download | linux-872fb6dd6b07986417964e089074e7acfd025f4c.tar.xz linux-872fb6dd6b07986417964e089074e7acfd025f4c.zip | |
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: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'arch/ia64/kernel/setup.c')
| -rw-r--r-- | arch/ia64/kernel/setup.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c index 1b23ec126b63..1de86c96801d 100644 --- a/arch/ia64/kernel/setup.c +++ b/arch/ia64/kernel/setup.c @@ -855,11 +855,17 @@ identify_cpu (struct cpuinfo_ia64 *c) 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 setup_per_cpu_areas (void) { /* start_kernel() requires this... */ } +#endif /* * Do the following calculations: |