diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2009-04-29 09:47:27 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-29 10:20:34 +0200 |
| commit | bf6a57418d5445c98047edbec022c9e54d1526e6 (patch) | |
| tree | aa36c0a20241df92ab9a5d1fcb2bb3d63fd6c2b1 /arch/x86/kernel/vmlinux.lds.S | |
| parent | ae61836289a415351caa524d328110aaeae100d4 (diff) | |
| download | kernel_samsung_smdk4412-bf6a57418d5445c98047edbec022c9e54d1526e6.tar.gz kernel_samsung_smdk4412-bf6a57418d5445c98047edbec022c9e54d1526e6.tar.bz2 kernel_samsung_smdk4412-bf6a57418d5445c98047edbec022c9e54d1526e6.zip | |
x86, vmlinux.lds: unify .exit.* and .init.ramfs
[ Impact: cleanup ]
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Tim Abbott <tabbott@MIT.EDU>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <1240991249-27117-11-git-send-email-sam@ravnborg.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/vmlinux.lds.S')
| -rw-r--r-- | arch/x86/kernel/vmlinux.lds.S | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index c8dd71ecb56..1ab62a5fa1a 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -309,6 +309,26 @@ SECTIONS *(.altinstr_replacement) } + /* + * .exit.text is discard at runtime, not link time, to deal with + * references from .altinstructions and .eh_frame + */ + .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { + EXIT_TEXT + } + + .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { + EXIT_DATA + } + +#ifdef CONFIG_BLK_DEV_INITRD + . = ALIGN(PAGE_SIZE); + .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) { + __initramfs_start = .; + *(.init.ramfs) + __initramfs_end = .; + } +#endif #ifdef CONFIG_X86_32 # include "vmlinux_32.lds.S" |