diff options
author | Jean-Paul Saman <jean-paul.saman@nxp.com> | 2007-02-10 04:44:44 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 13:51:25 -0500 |
commit | 67d38229dfa64cf9a75f83746dde345f47bbd8dc (patch) | |
tree | 36ecb1005e79616e4d1274e1c0ebf793125aeb38 /arch/m68k/kernel | |
parent | c33df4eaaf41fd3e34837a6ae9a5f9970c393d9f (diff) |
[PATCH] disable init/initramfs.c: architectures
Update all arch/*/kernel/vmlinux.lds.S to not include space for initramfs
when CONFIG_BLK_DEV_INITRAMFS is not selected. This saves another 4 kbytes
on most platfoms (some reserve PAGE_SIZE for initramfs).
Signed-off-by: Jean-Paul Saman <jean-paul.saman@nxp.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: <linux-arch@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r-- | arch/m68k/kernel/vmlinux-std.lds | 2 | ||||
-rw-r--r-- | arch/m68k/kernel/vmlinux-sun3.lds | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds index d2794452b195..437b4f8d86c5 100644 --- a/arch/m68k/kernel/vmlinux-std.lds +++ b/arch/m68k/kernel/vmlinux-std.lds | |||
@@ -61,10 +61,12 @@ SECTIONS | |||
61 | .con_initcall.init : { *(.con_initcall.init) } | 61 | .con_initcall.init : { *(.con_initcall.init) } |
62 | __con_initcall_end = .; | 62 | __con_initcall_end = .; |
63 | SECURITY_INIT | 63 | SECURITY_INIT |
64 | #ifdef CONFIG_BLK_DEV_INITRD | ||
64 | . = ALIGN(8192); | 65 | . = ALIGN(8192); |
65 | __initramfs_start = .; | 66 | __initramfs_start = .; |
66 | .init.ramfs : { *(.init.ramfs) } | 67 | .init.ramfs : { *(.init.ramfs) } |
67 | __initramfs_end = .; | 68 | __initramfs_end = .; |
69 | #endif | ||
68 | . = ALIGN(8192); | 70 | . = ALIGN(8192); |
69 | __init_end = .; | 71 | __init_end = .; |
70 | 72 | ||
diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds index 8c7eccbfc982..2868e206fc76 100644 --- a/arch/m68k/kernel/vmlinux-sun3.lds +++ b/arch/m68k/kernel/vmlinux-sun3.lds | |||
@@ -55,10 +55,12 @@ __init_begin = .; | |||
55 | .con_initcall.init : { *(.con_initcall.init) } | 55 | .con_initcall.init : { *(.con_initcall.init) } |
56 | __con_initcall_end = .; | 56 | __con_initcall_end = .; |
57 | SECURITY_INIT | 57 | SECURITY_INIT |
58 | #ifdef CONFIG_BLK_DEV_INITRD | ||
58 | . = ALIGN(8192); | 59 | . = ALIGN(8192); |
59 | __initramfs_start = .; | 60 | __initramfs_start = .; |
60 | .init.ramfs : { *(.init.ramfs) } | 61 | .init.ramfs : { *(.init.ramfs) } |
61 | __initramfs_end = .; | 62 | __initramfs_end = .; |
63 | #endif | ||
62 | . = ALIGN(8192); | 64 | . = ALIGN(8192); |
63 | __init_end = .; | 65 | __init_end = .; |
64 | .data.init.task : { *(.data.init_task) } | 66 | .data.init.task : { *(.data.init_task) } |