diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-25 10:45:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-25 10:47:00 +0200 |
| commit | 704daf55c7297e727021063cb5d8ba1c55b84426 (patch) | |
| tree | 15e7b49c69f1ba742ec5fb3a009e51e1564d6a75 /arch/x86/boot/compressed/vmlinux.lds.S | |
| parent | b0c6fbe458183cc7e1cab17be6efcbe7e435bad3 (diff) | |
| parent | 123f3e1d76952759c0fc8b4fec55a3fc8084d56f (diff) | |
| download | blackbird-op-linux-704daf55c7297e727021063cb5d8ba1c55b84426.tar.gz blackbird-op-linux-704daf55c7297e727021063cb5d8ba1c55b84426.zip | |
Merge branch 'x86/asm' into x86/urgent
Merge reason: The linker script cleanups are ready for upstream.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 cc353e1b3ffd..f4193bb48782 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 : { |
