Skip to contentSkip to conversation

x86: fix section mismatch for i386 init code

PATCH In review Robert Richter 1 participant 3 messages Jul 27, 2009 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 arch/x86/kernel/head_32.S |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
arch/x86/kernel/head_32.S +5 -1
index 8663afb..0d98a01 100644
@@ -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
Signature · 1 line
1.6.3.3
#1 lore raw
Commit-ID:  56d15a6e6e65b3a5afc1d8095717bab1a3a025be
Gitweb:     http://git.kernel.org/tip/56d15a6e6e65b3a5afc1d8095717bab1a3a025be
Author:     Robert Richter <[email protected]>
AuthorDate: Mon, 27 Jul 2009 19:43:52 +0200
Committer:  H. Peter Anvin <[email protected]>
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.

LKML-Reference: <[email protected]>

---
 arch/x86/kernel/head_32.S |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
arch/x86/kernel/head_32.S +5 -1
index 8663afb..0d98a01 100644
@@ -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
#2 lore raw
In reply to Robert Richter
Commit-ID:  0e83815be719d3391bf5ea24b7fe696c07dbd417
Gitweb:     http://git.kernel.org/tip/0e83815be719d3391bf5ea24b7fe696c07dbd417
Author:     Robert Richter <[email protected]>
AuthorDate: Mon, 27 Jul 2009 19:43:52 +0200
Committer:  H. Peter Anvin <[email protected]>
CommitDate: Mon, 27 Jul 2009 14:18:46 -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.

LKML-Reference: <[email protected]>

---
 arch/x86/kernel/head_32.S |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
arch/x86/kernel/head_32.S +5 -1
index 8663afb..0d98a01 100644
@@ -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