aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/include
diff options
context:
space:
mode:
authorTim Abbott <tabbott@ksplice.com>2009-09-24 10:36:20 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-09-24 20:16:22 -0400
commit5d150a97f9391f5bcd7ba0d59d7a11c3de3cea80 (patch)
treefca9e252fdb2c481b1497f9d50d2f371f5265fe4 /arch/um/include
parentcd3db323eb88514c45d25db51335a522560af702 (diff)
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>
Diffstat (limited to 'arch/um/include')
-rw-r--r--arch/um/include/asm/common.lds.S29
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 @@
16 16
17 . = ALIGN(4096); 17 . = ALIGN(4096);
18 .note : { *(.note.*) } 18 .note : { *(.note.*) }
19 __ex_table : { 19 EXCEPTION_TABLE(0)
20 __start___ex_table = .;
21 *(__ex_table)
22 __stop___ex_table = .;
23 }
24 20
25 BUG_TABLE 21 BUG_TABLE
26 22
@@ -43,28 +39,17 @@
43 } 39 }
44 40
45 .init.setup : { 41 .init.setup : {
46 __setup_start = .; 42 INIT_SETUP(0)
47 *(.init.setup)
48 __setup_end = .;
49 } 43 }
50 44
51 . = ALIGN(32); 45 PERCPU(32)
52 .data.percpu : {
53 __per_cpu_start = . ;
54 *(.data.percpu)
55 __per_cpu_end = . ;
56 }
57 46
58 .initcall.init : { 47 .initcall.init : {
59 __initcall_start = .; 48 INIT_CALLS
60 INITCALLS
61 __initcall_end = .;
62 } 49 }
63 50
64 .con_initcall.init : { 51 .con_initcall.init : {
65 __con_initcall_start = .; 52 CON_INITCALL
66 *(.con_initcall.init)
67 __con_initcall_end = .;
68 } 53 }
69 54
70 .uml.initcall.init : { 55 .uml.initcall.init : {
@@ -118,8 +103,6 @@
118 103
119 . = ALIGN(4096); 104 . = ALIGN(4096);
120 .init.ramfs : { 105 .init.ramfs : {
121 __initramfs_start = .; 106 INIT_RAM_FS
122 *(.init.ramfs)
123 __initramfs_end = .;
124 } 107 }
125 108