um: Clean up linker script using standard macros.

Signed-off-by: Tim Abbott <tabbott@ksplice.com>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: user-mode-linux-devel@lists.sourceforge.net
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 6 insertions, 23 deletions

diff --git a/arch/um/include/asm/common.lds.S b/arch/um/include/asm/common.lds.S
index 37ecc5577a9a..ac55b9efa1ce 100644
--- a/arch/um/include/asm/common.lds.S
+++ b/arch/um/include/asm/common.lds.S
@@ -16,11 +16,7 @@
 
   . = ALIGN(4096);
   .note : { *(.note.*) }
-  __ex_table : {
-        __start___ex_table = .;
-        *(__ex_table)
-        __stop___ex_table = .;
-  }
+  EXCEPTION_TABLE(0)
 
   BUG_TABLE
 
@@ -43,28 +39,17 @@
   }
         
   .init.setup : {
-        __setup_start = .;
-        *(.init.setup)
-        __setup_end = .;
+        INIT_SETUP(0)
   }
 
-  . = ALIGN(32);
-  .data.percpu : {
-        __per_cpu_start = . ;
-        *(.data.percpu)
-        __per_cpu_end = . ;
-  }
+  PERCPU(32)
         
   .initcall.init : {
-        __initcall_start = .;
-        INITCALLS
-        __initcall_end = .;
+        INIT_CALLS
   }
 
   .con_initcall.init : {
-        __con_initcall_start = .;
-        *(.con_initcall.init)
-        __con_initcall_end = .;
+        CON_INITCALL
   }
 
   .uml.initcall.init : {
@@ -118,8 +103,6 @@
 
    . = ALIGN(4096);
   .init.ramfs : {
-        __initramfs_start = .;
-        *(.init.ramfs)
-        __initramfs_end = .;
+        INIT_RAM_FS
   }