Commit 92417df0 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds

x86_64: Squash initial_code modpost warnings

Get rid of warnings like

WARNING: vmlinux.o(.bootstrap.text+0x1a8): Section mismatch: reference to .init.text:x86_64_start_kernel (between 'initial_code' and 'init_rsp')

- Move initialization code into .text.head like i386 because modpost knows about this already
- Mark initial_code .initdata
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent dec2e6b7
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
*/ */
.text .text
.section .bootstrap.text .section .text.head
.code64 .code64
.globl startup_64 .globl startup_64
startup_64: startup_64:
...@@ -243,10 +243,16 @@ ENTRY(secondary_startup_64) ...@@ -243,10 +243,16 @@ ENTRY(secondary_startup_64)
lretq lretq
/* SMP bootup changes these two */ /* SMP bootup changes these two */
#ifndef CONFIG_HOTPLUG_CPU
.pushsection .init.data
#endif
.align 8 .align 8
.globl initial_code .globl initial_code
initial_code: initial_code:
.quad x86_64_start_kernel .quad x86_64_start_kernel
#ifndef CONFIG_HOTPLUG_CPU
.popsection
#endif
.globl init_rsp .globl init_rsp
init_rsp: init_rsp:
.quad init_thread_union+THREAD_SIZE-8 .quad init_thread_union+THREAD_SIZE-8
......
...@@ -28,7 +28,7 @@ SECTIONS ...@@ -28,7 +28,7 @@ SECTIONS
_text = .; /* Text and read-only data */ _text = .; /* Text and read-only data */
.text : AT(ADDR(.text) - LOAD_OFFSET) { .text : AT(ADDR(.text) - LOAD_OFFSET) {
/* First the code that has to be first for bootstrapping */ /* First the code that has to be first for bootstrapping */
*(.bootstrap.text) *(.text.head)
_stext = .; _stext = .;
/* Then the rest */ /* Then the rest */
TEXT_TEXT TEXT_TEXT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment