summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorTim Abbott <tabbott@ksplice.com>2009-10-18 19:23:52 +0200
committerGreg Ungerer <gerg@goober.(none)>2009-12-04 02:45:31 +0100
commit84bd75715509c862eb9f536c4181dfa2b6d408dc (patch)
tree278630ba82a42fb41c76bf4c0405f34a41ebf3b8 /arch
parentm68knommu: Use INIT_TASK_DATA and CACHELINE_ALIGNED_DATA. (diff)
downloadlinux-84bd75715509c862eb9f536c4181dfa2b6d408dc.tar.xz
linux-84bd75715509c862eb9f536c4181dfa2b6d408dc.zip
m68knommu: Use more macros inside the .init section.
Signed-off-by: Tim Abbott <tabbott@ksplice.com> Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/m68knommu/kernel/vmlinux.lds.S24
1 files changed, 5 insertions, 19 deletions
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index d6c814e4055b..f20de3a6c687 100644
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -161,25 +161,11 @@ SECTIONS {
INIT_TEXT
_einittext = .;
INIT_DATA
- . = ALIGN(16);
- __setup_start = .;
- *(.init.setup)
- __setup_end = .;
- __initcall_start = .;
- INITCALLS
- __initcall_end = .;
- __con_initcall_start = .;
- *(.con_initcall.init)
- __con_initcall_end = .;
- __security_initcall_start = .;
- *(.security_initcall.init)
- __security_initcall_end = .;
-#ifdef CONFIG_BLK_DEV_INITRD
- . = ALIGN(4);
- __initramfs_start = .;
- *(.init.ramfs)
- __initramfs_end = .;
-#endif
+ INIT_SETUP(16)
+ INIT_CALLS
+ CON_INITCALL
+ SECURITY_INITCALL
+ INIT_RAM_FS
. = ALIGN(PAGE_SIZE);
__init_end = .;
} > INIT