Skip to content

Commit

Permalink
[PATCH] vmlinux.lds: consolidate initcall sections
Browse files Browse the repository at this point in the history 
Add a vmlinux.lds.h helper macro for defining the eight-level initcall table,
teach all the architectures to use it.

This is a prerequisite for a patch which performs initcall synchronisation for
multithreaded-probing.

Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
[ Added AVR32 as well ]
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Andrew Morton authored and Linus Torvalds committed Oct 27, 2006
1 parent e803915 commit 61ce1ef
Show file tree
Hide file tree
Showing 22 changed files with 31 additions and 147 deletions.
8 changes: 1 addition & 7 deletions arch/alpha/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,7 @@ SECTIONS
. = ALIGN(8);
__initcall_start = .;
.initcall.init : {
*(.initcall1.init)
*(.initcall2.init)
*(.initcall3.init)
*(.initcall4.init)
*(.initcall5.init)
*(.initcall6.init)
*(.initcall7.init)
INITCALLS
}
__initcall_end = .;

Expand Down
8 changes: 1 addition & 7 deletions arch/arm/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,7 @@ SECTIONS
*(.early_param.init)
__early_end = .;
__initcall_start = .;
*(.initcall1.init)
*(.initcall2.init)
*(.initcall3.init)
*(.initcall4.init)
*(.initcall5.init)
*(.initcall6.init)
*(.initcall7.init)
INITCALLS
__initcall_end = .;
__con_initcall_start = .;
*(.con_initcall.init)
Expand Down
8 changes: 1 addition & 7 deletions arch/avr32/kernel/vmlinux.lds.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,7 @@ SECTIONS
__setup_end = .;
. = ALIGN(4);
__initcall_start = .;
*(.initcall1.init)
*(.initcall2.init)
*(.initcall3.init)
*(.initcall4.init)
*(.initcall5.init)
*(.initcall6.init)
*(.initcall7.init)
INITCALLS
__initcall_end = .;
__con_initcall_start = .;
*(.con_initcall.init)
Expand Down
8 changes: 1 addition & 7 deletions arch/frv/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,7 @@ SECTIONS

__initcall_start = .;
.initcall.init : {
*(.initcall1.init)
*(.initcall2.init)
*(.initcall3.init)
*(.initcall4.init)
*(.initcall5.init)
*(.initcall6.init)
*(.initcall7.init)
INITCALLS
}
__initcall_end = .;
__con_initcall_start = .;
Expand Down
8 changes: 1 addition & 7 deletions arch/h8300/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,7 @@ SECTIONS
. = ALIGN(0x4) ;
___setup_end = .;
___initcall_start = .;
*(.initcall1.init)
*(.initcall2.init)
*(.initcall3.init)
*(.initcall4.init)
*(.initcall5.init)
*(.initcall6.init)
*(.initcall7.init)
INITCALLS
___initcall_end = .;
___con_initcall_start = .;
*(.con_initcall.init)
Expand Down
8 changes: 1 addition & 7 deletions arch/i386/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,7 @@ SECTIONS
__setup_end = .;
__initcall_start = .;
.initcall.init : AT(ADDR(.initcall.init) - LOAD_OFFSET) {
*(.initcall1.init)
*(.initcall2.init)
*(.initcall3.init)
*(.initcall4.init)
*(.initcall5.init)
*(.initcall6.init)
*(.initcall7.init)
INITCALLS
}
__initcall_end = .;
__con_initcall_start = .;
Expand Down
8 changes: 1 addition & 7 deletions arch/ia64/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,7 @@ SECTIONS
.initcall.init : AT(ADDR(.initcall.init) - LOAD_OFFSET)
{
__initcall_start = .;
*(.initcall1.init)
*(.initcall2.init)
*(.initcall3.init)
*(.initcall4.init)
*(.initcall5.init)
*(.initcall6.init)
*(.initcall7.init)
INITCALLS
__initcall_end = .;
}

Expand Down
8 changes: 1 addition & 7 deletions arch/m32r/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,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 = .;
Expand Down
8 changes: 1 addition & 7 deletions arch/m68knommu/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,7 @@ SECTIONS {
*(.init.setup)
__setup_end = .;
__initcall_start = .;
*(.initcall1.init)
*(.initcall2.init)
*(.initcall3.init)
*(.initcall4.init)
*(.initcall5.init)
*(.initcall6.init)
*(.initcall7.init)
INITCALLS
__initcall_end = .;
__con_initcall_start = .;
*(.con_initcall.init)
Expand Down
8 changes: 1 addition & 7 deletions arch/mips/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,13 +91,7 @@ SECTIONS

__initcall_start = .;
.initcall.init : {
*(.initcall1.init)
*(.initcall2.init)
*(.initcall3.init)
*(.initcall4.init)
*(.initcall5.init)
*(.initcall6.init)
*(.initcall7.init)
INITCALLS
}
__initcall_end = .;

Expand Down
8 changes: 1 addition & 7 deletions arch/parisc/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,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 = .;
Expand Down
8 changes: 1 addition & 7 deletions arch/powerpc/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,7 @@ SECTIONS

.initcall.init : {
__initcall_start = .;
*(.initcall1.init)
*(.initcall2.init)
*(.initcall3.init)
*(.initcall4.init)
*(.initcall5.init)
*(.initcall6.init)
*(.initcall7.init)
INITCALLS
__initcall_end = .;
}

Expand Down
8 changes: 1 addition & 7 deletions arch/ppc/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,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 = .;

Expand Down
8 changes: 1 addition & 7 deletions arch/s390/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,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 = .;
Expand Down
8 changes: 1 addition & 7 deletions arch/sh/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,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 = .;
Expand Down
8 changes: 1 addition & 7 deletions arch/sh64/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,7 @@ SECTIONS
__setup_end = .;
__initcall_start = .;
.initcall.init : C_PHYS(.initcall.init) {
*(.initcall1.init)
*(.initcall2.init)
*(.initcall3.init)
*(.initcall4.init)
*(.initcall5.init)
*(.initcall6.init)
*(.initcall7.init)
INITCALLS
}
__initcall_end = .;
__con_initcall_start = .;
Expand Down
8 changes: 1 addition & 7 deletions arch/sparc/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,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 = .;
Expand Down
8 changes: 1 addition & 7 deletions arch/sparc64/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,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 = .;
Expand Down
8 changes: 1 addition & 7 deletions arch/v850/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,13 +140,7 @@
___setup_end = . ; \
___initcall_start = . ; \
*(.initcall.init) \
*(.initcall1.init) \
*(.initcall2.init) \
*(.initcall3.init) \
*(.initcall4.init) \
*(.initcall5.init) \
*(.initcall6.init) \
*(.initcall7.init) \
INITCALLS \
. = ALIGN (4) ; \
___initcall_end = . ; \
___con_initcall_start = .; \
Expand Down
8 changes: 1 addition & 7 deletions arch/x86_64/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,7 @@ SECTIONS
__setup_end = .;
__initcall_start = .;
.initcall.init : AT(ADDR(.initcall.init) - LOAD_OFFSET) {
*(.initcall1.init)
*(.initcall2.init)
*(.initcall3.init)
*(.initcall4.init)
*(.initcall5.init)
*(.initcall6.init)
*(.initcall7.init)
INITCALLS
}
__initcall_end = .;
__con_initcall_start = .;
Expand Down
8 changes: 1 addition & 7 deletions arch/xtensa/kernel/vmlinux.lds.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,7 @@ SECTIONS

__initcall_start = .;
.initcall.init : {
*(.initcall1.init)
*(.initcall2.init)
*(.initcall3.init)
*(.initcall4.init)
*(.initcall5.init)
*(.initcall6.init)
*(.initcall7.init)
INITCALLS
}
__initcall_end = .;

Expand Down
10 changes: 10 additions & 0 deletions include/asm-generic/vmlinux.lds.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,3 +213,13 @@

#define NOTES \
.notes : { *(.note.*) } :note

#define INITCALLS \
*(.initcall1.init) \
*(.initcall2.init) \
*(.initcall3.init) \
*(.initcall4.init) \
*(.initcall5.init) \
*(.initcall6.init) \
*(.initcall7.init)

0 comments on commit 61ce1ef

Please sign in to comment.