diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2006-10-29 11:21:51 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-29 12:07:41 -0800 |
| commit | 5fdb51a10f3ab4320c3170b79d66ce34a6e65a67 (patch) | |
| tree | fcdfc6d05bd41b6ceb80315c8fa37e13f17a27de /arch/m68k | |
| parent | 3d8334def5cf831d2ed438aae021696a2faa4ddd (diff) | |
| download | op-kernel-dev-5fdb51a10f3ab4320c3170b79d66ce34a6e65a67.zip op-kernel-dev-5fdb51a10f3ab4320c3170b79d66ce34a6e65a67.tar.gz | |
[PATCH] m68k: consolidate initcall sections
Commit 61ce1efe6e40233663d27ab8ac9ba9710eebcaad missed the m68k initcall
sections.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/kernel/vmlinux-std.lds | 8 | ||||
| -rw-r--r-- | arch/m68k/kernel/vmlinux-sun3.lds | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds index 69d1d3d..d279445 100644 --- a/arch/m68k/kernel/vmlinux-std.lds +++ b/arch/m68k/kernel/vmlinux-std.lds @@ -54,13 +54,7 @@ SECTIONS __setup_end = .; __initcall_start = .; .initcall.init : { - *(.initcall1.init) - *(.initcall2.init) - *(.initcall3.init) - *(.initcall4.init) - *(.initcall5.init) - *(.initcall6.init) - *(.initcall7.init) + INITCALLS } __initcall_end = .; __con_initcall_start = .; diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds index 65cc39c..2550b4a 100644 --- a/arch/m68k/kernel/vmlinux-sun3.lds +++ b/arch/m68k/kernel/vmlinux-sun3.lds @@ -48,13 +48,7 @@ __init_begin = .; __setup_end = .; __initcall_start = .; .initcall.init : { - *(.initcall1.init) - *(.initcall2.init) - *(.initcall3.init) - *(.initcall4.init) - *(.initcall5.init) - *(.initcall6.init) - *(.initcall7.init) + INITCALLS } __initcall_end = .; __con_initcall_start = .; |
