lkml.org 
[lkml]   [2009]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH] i386: fix section mismatches for init code with !HOTPLUG_CPU
Commit 0e83815be719d3391bf5ea24b7fe696c07dbd417 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>

---
arch/x86/kernel/head_32.S | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)

--- linux-2.6.31-rc6/arch/x86/kernel/head_32.S 2009-08-18 15:31:16.000000000 +0200
+++ 2.6.31-rc6-i386-head-sections/arch/x86/kernel/head_32.S 2009-08-18 10:38:31.000000000 +0200
@@ -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




\
 
 \ /
  Last update: 2009-08-18 17:43    [W:0.043 / U:0.932 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site