Re: vmlinux.lds: consolidate initcall sections

Geert Uytterhoeven
2006-10-29T10:22:05Z

On Fri, 27 Oct 2006, Haavard Skinnemoen wrote:
> On 10/27/06, Andrew Morton <akpm@osdl.org> wrote:
> > From: Andrew Morton <akpm@osdl.org>
> >
> > Add a vmlinux.lds.h helper macro for defining the eight-level initcall
> > table,
> > teach all the architectures to use it.
>
> Please include AVR32 as well while you're at it ;)

And m68k :-)

Signed-Off-By: Geert Uytterhoeven <geert@linux-m68k.org>

--- linux/arch/m68k/kernel/vmlinux-std.lds 2006-09-25 22:34:27.000000000 +0200
+++ linux-m68k/arch/m68k/kernel/vmlinux-std.lds 2006-10-29 11:15:18.000000000 +0100
@@ -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 = .;
--- linux/arch/m68k/kernel/vmlinux-sun3.lds 2006-09-25 22:34:27.000000000 +0200
+++ linux-m68k/arch/m68k/kernel/vmlinux-sun3.lds 2006-10-29 11:14:50.000000000 +0100
@@ -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 = .;

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds