diff options
| author | Tim Abbott <tabbott@ksplice.com> | 2009-09-16 16:44:27 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-09-18 10:21:49 -0700 |
| commit | 1dc818c1c574a4caa7b575bd9018d04090fb6c86 (patch) | |
| tree | 346f49d1004f2c8024bb931ea5164060a10d6cc9 /arch/x86/boot/compressed/vmlinux.lds.S | |
| parent | d223246ef7e6d73c8e3d9b58f27f2eb3fe95e25d (diff) | |
| download | op-kernel-dev-1dc818c1c574a4caa7b575bd9018d04090fb6c86.zip op-kernel-dev-1dc818c1c574a4caa7b575bd9018d04090fb6c86.tar.gz | |
x86: convert compressed loader to use __HEAD and HEAD_TEXT macros.
This has the consequence of changing the section name use for head
code from ".text.head" to ".head.text".
Linus suggested that we merge the ".text.head" section with ".text"
(presumably while preserving the fact that the head code starts at 0).
When I tried this it caused the kernel to not boot.
Signed-off-by: Tim Abbott <tabbott@ksplice.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot/compressed/vmlinux.lds.S')
| -rw-r--r-- | arch/x86/boot/compressed/vmlinux.lds.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/boot/compressed/vmlinux.lds.S b/arch/x86/boot/compressed/vmlinux.lds.S index cc353e1..f4193bb 100644 --- a/arch/x86/boot/compressed/vmlinux.lds.S +++ b/arch/x86/boot/compressed/vmlinux.lds.S @@ -1,3 +1,5 @@ +#include <asm-generic/vmlinux.lds.h> + OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT) #undef i386 @@ -18,9 +20,9 @@ SECTIONS * address 0. */ . = 0; - .text.head : { + .head.text : { _head = . ; - *(.text.head) + HEAD_TEXT _ehead = . ; } .rodata.compressed : { |
