aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
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
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')
-rw-r--r--arch/um/include/asm/common.lds.S29
-rw-r--r--arch/um/kernel/dyn.lds.S9
-rw-r--r--arch/um/kernel/uml.lds.S26
3 files changed, 14 insertions, 50 deletions
diff --git a/arch/um/include/asm/common.lds.S b/arch/um/include/asm/common.lds.S
index 37ecc5577a9..ac55b9efa1c 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
diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S
index 715a188c047..7fcad58e216 100644
--- a/arch/um/kernel/dyn.lds.S
+++ b/arch/um/kernel/dyn.lds.S
@@ -16,11 +16,7 @@ SECTIONS
16 _text = .; 16 _text = .;
17 _stext = .; 17 _stext = .;
18 __init_begin = .; 18 __init_begin = .;
19 .init.text : { 19 INIT_TEXT_SECTION(PAGE_SIZE)
20 _sinittext = .;
21 INIT_TEXT
22 _einittext = .;
23 }
24 20
25 . = ALIGN(PAGE_SIZE); 21 . = ALIGN(PAGE_SIZE);
26 22
@@ -96,8 +92,7 @@ SECTIONS
96 .init_array : { *(.init_array) } 92 .init_array : { *(.init_array) }
97 .fini_array : { *(.fini_array) } 93 .fini_array : { *(.fini_array) }
98 .data : { 94 .data : {
99 . = ALIGN(KERNEL_STACK_SIZE); /* init_task */ 95 INIT_TASK_DATA(KERNEL_STACK_SIZE)
100 *(.data.init_task)
101 . = ALIGN(KERNEL_STACK_SIZE); 96 . = ALIGN(KERNEL_STACK_SIZE);
102 *(.data.init_irqstack) 97 *(.data.init_irqstack)
103 DATA_DATA 98 DATA_DATA
diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S
index 2ebd39765db..e7a6cca667a 100644
--- a/arch/um/kernel/uml.lds.S
+++ b/arch/um/kernel/uml.lds.S
@@ -22,11 +22,7 @@ SECTIONS
22 _text = .; 22 _text = .;
23 _stext = .; 23 _stext = .;
24 __init_begin = .; 24 __init_begin = .;
25 .init.text : { 25 INIT_TEXT_SECTION(PAGE_SIZE)
26 _sinittext = .;
27 INIT_TEXT
28 _einittext = .;
29 }
30 . = ALIGN(PAGE_SIZE); 26 . = ALIGN(PAGE_SIZE);
31 27
32 .text : 28 .text :
@@ -52,8 +48,7 @@ SECTIONS
52 init.data : { INIT_DATA } 48 init.data : { INIT_DATA }
53 .data : 49 .data :
54 { 50 {
55 . = ALIGN(KERNEL_STACK_SIZE); /* init_task */ 51 INIT_TASK_DATA(KERNEL_STACK_SIZE)
56 *(.data.init_task)
57 . = ALIGN(KERNEL_STACK_SIZE); 52 . = ALIGN(KERNEL_STACK_SIZE);
58 *(.data.init_irqstack) 53 *(.data.init_irqstack)
59 DATA_DATA 54 DATA_DATA
@@ -81,19 +76,10 @@ SECTIONS
81 _edata = .; 76 _edata = .;
82 PROVIDE (edata = .); 77 PROVIDE (edata = .);
83 . = ALIGN(PAGE_SIZE); 78 . = ALIGN(PAGE_SIZE);
84 .sbss : 79 __bss_start = .;
85 { 80 PROVIDE(_bss_start = .);
86 __bss_start = .; 81 SBSS(0)
87 PROVIDE(_bss_start = .); 82 BSS(0)
88 *(.sbss)
89 *(.scommon)
90 }
91 .bss :
92 {
93 *(.dynbss)
94 *(.bss)
95 *(COMMON)
96 }
97 _end = .; 83 _end = .;
98 PROVIDE (end = .); 84 PROVIDE (end = .);
99 85