diff options
| author | Robert Richter <robert.richter@amd.com> | 2009-07-27 19:43:52 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-07-27 14:18:46 -0700 |
| commit | 0e83815be719d3391bf5ea24b7fe696c07dbd417 (patch) | |
| tree | 846980e18b5bd98ffe9b823799157aa1c3e18273 /arch/x86 | |
| parent | e00b95debb9a0f023b61abcd4b1e74f687276b47 (diff) | |
| download | linux-stable-0e83815be719d3391bf5ea24b7fe696c07dbd417.tar.gz linux-stable-0e83815be719d3391bf5ea24b7fe696c07dbd417.tar.bz2 linux-stable-0e83815be719d3391bf5ea24b7fe696c07dbd417.zip | |
x86: fix section mismatch for i386 init code
Startup code for i386 in arch/x86/kernel/head_32.S is using the
reference variable initial_code that is located in the .cpuinit.data
section. If CONFIG_HOTPLUG_CPU is enabled, startup code is not in an
init section and can be called later too. In this case the reference
initial_code must be kept too. This patch fixes this. See below for
the section mismatch warning.
WARNING: vmlinux.o(.cpuinit.data+0x0): Section mismatch in reference
from the variable initial_code to the function
.init.text:i386_start_kernel()
The variable __cpuinitdata initial_code references
a function __init i386_start_kernel().
If i386_start_kernel is only used by initial_code then
annotate i386_start_kernel with a matching annotation.
Signed-off-by: Robert Richter <robert.richter@amd.com>
LKML-Reference: <1248716632-26844-1-git-send-email-robert.richter@amd.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/head_32.S | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 8663afb56535..0d98a01cbdb2 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S @@ -602,7 +602,11 @@ ignore_int: #endif iret -.section .cpuinit.data,"wa" +#ifndef CONFIG_HOTPLUG_CPU + __CPUINITDATA +#else + __REFDATA +#endif .align 4 ENTRY(initial_code) .long i386_start_kernel |