[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <tip-56d15a6e6e65b3a5afc1d8095717bab1a3a025be@git.kernel.org>
Date: Mon, 27 Jul 2009 21:19:23 GMT
From: tip-bot for Robert Richter <robert.richter@....com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
robert.richter@....com, tglx@...utronix.de
Subject: [tip:x86/urgent] x86: fix section mismatch for i386 init code
Commit-ID: 56d15a6e6e65b3a5afc1d8095717bab1a3a025be
Gitweb: http://git.kernel.org/tip/56d15a6e6e65b3a5afc1d8095717bab1a3a025be
Author: Robert Richter <robert.richter@....com>
AuthorDate: Mon, 27 Jul 2009 19:43:52 +0200
Committer: H. Peter Anvin <hpa@...or.com>
CommitDate: Mon, 27 Jul 2009 13:46:47 -0700
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@....com>
LKML-Reference: <1248716632-26844-1-git-send-email-robert.richter@....com>
Signed-off-by: H. Peter Anvin <hpa@...or.com>
---
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 8663afb..0d98a01 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists