Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61ce1efe authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

[PATCH] vmlinux.lds: consolidate initcall sections



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: default avatarAndrew Morton <akpm@osdl.org>
[ Added AVR32 as well ]
Signed-off-by: default avatarHaavard Skinnemoen <hskinnemoen@atmel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e8039150
Loading
Loading
Loading
Loading
+1 −7
Original line number Original line Diff line number Diff line
@@ -48,13 +48,7 @@ SECTIONS
  . = ALIGN(8);
  . = ALIGN(8);
  __initcall_start = .;
  __initcall_start = .;
  .initcall.init : {
  .initcall.init : {
	*(.initcall1.init) 
	INITCALLS
	*(.initcall2.init) 
	*(.initcall3.init) 
	*(.initcall4.init) 
	*(.initcall5.init) 
	*(.initcall6.init) 
	*(.initcall7.init)
  }
  }
  __initcall_end = .;
  __initcall_end = .;


+1 −7
Original line number Original line Diff line number Diff line
@@ -45,13 +45,7 @@ SECTIONS
			*(.early_param.init)
			*(.early_param.init)
		__early_end = .;
		__early_end = .;
		__initcall_start = .;
		__initcall_start = .;
			*(.initcall1.init)
			INITCALLS
			*(.initcall2.init)
			*(.initcall3.init)
			*(.initcall4.init)
			*(.initcall5.init)
			*(.initcall6.init)
			*(.initcall7.init)
		__initcall_end = .;
		__initcall_end = .;
		__con_initcall_start = .;
		__con_initcall_start = .;
			*(.con_initcall.init)
			*(.con_initcall.init)
+1 −7
Original line number Original line Diff line number Diff line
@@ -38,13 +38,7 @@ SECTIONS
		__setup_end = .;
		__setup_end = .;
		. = ALIGN(4);
		. = ALIGN(4);
		__initcall_start = .;
		__initcall_start = .;
			*(.initcall1.init)
			INITCALLS
			*(.initcall2.init)
			*(.initcall3.init)
			*(.initcall4.init)
			*(.initcall5.init)
			*(.initcall6.init)
			*(.initcall7.init)
		__initcall_end = .;
		__initcall_end = .;
		__con_initcall_start = .;
		__con_initcall_start = .;
			*(.con_initcall.init)
			*(.con_initcall.init)
+1 −7
Original line number Original line Diff line number Diff line
@@ -44,13 +44,7 @@ SECTIONS


  __initcall_start = .;
  __initcall_start = .;
  .initcall.init : {
  .initcall.init : {
	*(.initcall1.init)
	INITCALLS
	*(.initcall2.init)
	*(.initcall3.init)
	*(.initcall4.init)
	*(.initcall5.init)
	*(.initcall6.init)
	*(.initcall7.init)
  }
  }
  __initcall_end = .;
  __initcall_end = .;
  __con_initcall_start = .;
  __con_initcall_start = .;
+1 −7
Original line number Original line Diff line number Diff line
@@ -118,13 +118,7 @@ SECTIONS
	. = ALIGN(0x4) ;
	. = ALIGN(0x4) ;
	___setup_end = .;
	___setup_end = .;
	___initcall_start = .;
	___initcall_start = .;
		*(.initcall1.init)
		INITCALLS
		*(.initcall2.init)
		*(.initcall3.init)
		*(.initcall4.init)
		*(.initcall5.init)
		*(.initcall6.init)
		*(.initcall7.init)
	___initcall_end = .;
	___initcall_end = .;
	___con_initcall_start = .;
	___con_initcall_start = .;
		*(.con_initcall.init)
		*(.con_initcall.init)
Loading