Commit 872fb6dd authored Jul 13, 2009 by Fenghua Yu Committed by Tejun Heo Jul 15, 2009

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>

parent 023bf6f1

arch/ia64/kernel/setup.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -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: