Commit 78b89ecd authored Aug 18, 2009 by Jan Beulich Committed by Ingo Molnar Aug 18, 2009

i386: Fix section mismatches for init code with !HOTPLUG_CPU



Commit 0e83815b changed the
section the initial_code variable gets allocated in, in an
attempt to address a section conflict warning. This, however
created a new section conflict when building without
HOTPLUG_CPU. The apparently only (reasonable) way to address
this is to always use __REFDATA.

Once at it, also fix a second section mismatch when not using
HOTPLUG_CPU.

Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Robert Richter <robert.richter@amd.com>
LKML-Reference: <4A8AE7CD020000780001054B@vpn.id2.novell.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent 1adcaafe

arch/x86/kernel/head_32.S

+1 −7

Original line number	Diff line number	Diff line
		@@ -261,9 +261,7 @@ page_pde_offset = (__PAGE_OFFSET >> 20);
		* which will be freed later
		*/

		#ifndef CONFIG_HOTPLUG_CPU
		.section .init.text,"ax",@progbits
		#endif
		__CPUINIT

		#ifdef CONFIG_SMP
		ENTRY(startup_32_smp)
		@@ -602,11 +600,7 @@ ignore_int:
		#endif
		iret

		#ifndef CONFIG_HOTPLUG_CPU
		__CPUINITDATA
		#else
		__REFDATA
		#endif
		.align 4
		ENTRY(initial_code)
		.long i386_start_kernel