diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2009-04-29 03:47:27 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-29 04:20:34 -0400 |
commit | bf6a57418d5445c98047edbec022c9e54d1526e6 (patch) | |
tree | aa36c0a20241df92ab9a5d1fcb2bb3d63fd6c2b1 /arch/x86/kernel/vmlinux_32.lds.S | |
parent | ae61836289a415351caa524d328110aaeae100d4 (diff) |
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_32.lds.S')
-rw-r--r-- | arch/x86/kernel/vmlinux_32.lds.S | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S index 5df9647bb5d9..36c8fbd3c762 100644 --- a/arch/x86/kernel/vmlinux_32.lds.S +++ b/arch/x86/kernel/vmlinux_32.lds.S | |||
@@ -1,24 +1,3 @@ | |||
1 | /* | ||
2 | * .exit.text is discard at runtime, not link time, to deal with | ||
3 | * references from .altinstructions and .eh_frame | ||
4 | */ | ||
5 | .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { | ||
6 | EXIT_TEXT | ||
7 | } | ||
8 | |||
9 | .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { | ||
10 | EXIT_DATA | ||
11 | } | ||
12 | |||
13 | #if defined(CONFIG_BLK_DEV_INITRD) | ||
14 | . = ALIGN(PAGE_SIZE); | ||
15 | .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) { | ||
16 | __initramfs_start = .; | ||
17 | *(.init.ramfs) | ||
18 | __initramfs_end = .; | ||
19 | } | ||
20 | #endif | ||
21 | |||
22 | PERCPU(PAGE_SIZE) | 1 | PERCPU(PAGE_SIZE) |
23 | 2 | ||
24 | . = ALIGN(PAGE_SIZE); | 3 | . = ALIGN(PAGE_SIZE); |