Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / include / asm-um / common.lds.S

diff --git a/include/asm-um/common.lds.S b/include/asm-um/common.lds.S
index 1010153faaf93731054d8789c6105ea9057ae70a..e3f010bd12b3cbaa9f724f768a884b1ae3021f3e 100644 (file)
--- a/include/asm-um/common.lds.S
+++ b/include/asm-um/common.lds.S
@@ -15,10 +15,13 @@
   PROVIDE (_unprotected_end = .);
 
   . = ALIGN(4096);
+  .note : { *(.note.*) }
   __start___ex_table = .;
   __ex_table : { *(__ex_table) }
   __stop___ex_table = .;
 
+  BUG_TABLE
+
   __uml_setup_start = .;
   .uml.setup.init : { *(.uml.setup.init) }
   __uml_setup_end = .;
@@ -42,13 +45,7 @@
        
   __initcall_start = .;
   .initcall.init : {
-       *(.initcall1.init) 
-       *(.initcall2.init) 
-       *(.initcall3.init) 
-       *(.initcall4.init) 
-       *(.initcall5.init) 
-       *(.initcall6.init) 
-       *(.initcall7.init)
+       INITCALLS
   }
   __initcall_end = .;