diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 15:03:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 15:03:04 -0400 |
commit | 080e89270a7bfb7d01fac9a67050f8ac6d6cdd11 (patch) | |
tree | 489e467292ca06420e85f185095323efb80c75b7 /arch | |
parent | 4b85df0419d1fb135d9d845876e8c7ee1393f83c (diff) | |
parent | 38bdc32af442b6ab09ed61b8b669072098c95dd2 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fix:
mm/slab: fix section mismatch warning
mm: fix section mismatch warnings
init/main: use __init_refok to fix section mismatch
kbuild: introduce __init_refok/__initdata_refok to supress section mismatch warnings
all-archs: consolidate .data section definition in asm-generic
all-archs: consolidate .text section definition in asm-generic
kbuild: add "Section mismatch" warning whitelist for powerpc
kbuild: make better section mismatch reports on i386, arm and mips
kbuild: make modpost section warnings clearer
kconfig: search harder for curses library in check-lxdialog.sh
kbuild: include limits.h in sumversion.c for PATH_MAX
powerpc: Fix the MODALIAS generation in modpost for of devices
Diffstat (limited to 'arch')
28 files changed, 67 insertions, 56 deletions
diff --git a/arch/alpha/kernel/vmlinux.lds.S b/arch/alpha/kernel/vmlinux.lds.S index cf1e6fc6c68..449e76f118d 100644 --- a/arch/alpha/kernel/vmlinux.lds.S +++ b/arch/alpha/kernel/vmlinux.lds.S | |||
@@ -15,7 +15,7 @@ SECTIONS | |||
15 | 15 | ||
16 | _text = .; /* Text and read-only data */ | 16 | _text = .; /* Text and read-only data */ |
17 | .text : { | 17 | .text : { |
18 | *(.text) | 18 | TEXT_TEXT |
19 | SCHED_TEXT | 19 | SCHED_TEXT |
20 | LOCK_TEXT | 20 | LOCK_TEXT |
21 | *(.fixup) | 21 | *(.fixup) |
@@ -89,7 +89,7 @@ SECTIONS | |||
89 | 89 | ||
90 | _data = .; | 90 | _data = .; |
91 | .data : { /* Data */ | 91 | .data : { /* Data */ |
92 | *(.data) | 92 | DATA_DATA |
93 | CONSTRUCTORS | 93 | CONSTRUCTORS |
94 | } | 94 | } |
95 | 95 | ||
diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S index e4156e7868c..2b7a8f5d8cf 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S | |||
@@ -90,7 +90,7 @@ SECTIONS | |||
90 | __exception_text_start = .; | 90 | __exception_text_start = .; |
91 | *(.exception.text) | 91 | *(.exception.text) |
92 | __exception_text_end = .; | 92 | __exception_text_end = .; |
93 | *(.text) | 93 | TEXT_TEXT |
94 | SCHED_TEXT | 94 | SCHED_TEXT |
95 | LOCK_TEXT | 95 | LOCK_TEXT |
96 | #ifdef CONFIG_MMU | 96 | #ifdef CONFIG_MMU |
@@ -158,7 +158,7 @@ SECTIONS | |||
158 | /* | 158 | /* |
159 | * and the usual data section | 159 | * and the usual data section |
160 | */ | 160 | */ |
161 | *(.data) | 161 | DATA_DATA |
162 | CONSTRUCTORS | 162 | CONSTRUCTORS |
163 | 163 | ||
164 | _edata = .; | 164 | _edata = .; |
diff --git a/arch/arm26/kernel/vmlinux-arm26-xip.lds.in b/arch/arm26/kernel/vmlinux-arm26-xip.lds.in index 046a8505401..4ec715c25de 100644 --- a/arch/arm26/kernel/vmlinux-arm26-xip.lds.in +++ b/arch/arm26/kernel/vmlinux-arm26-xip.lds.in | |||
@@ -64,7 +64,7 @@ SECTIONS | |||
64 | 64 | ||
65 | .text : { /* Real text segment */ | 65 | .text : { /* Real text segment */ |
66 | _text = .; /* Text and read-only data */ | 66 | _text = .; /* Text and read-only data */ |
67 | *(.text) | 67 | TEXT_TEXT |
68 | SCHED_TEXT | 68 | SCHED_TEXT |
69 | LOCK_TEXT /* FIXME - borrowed from arm32 - check*/ | 69 | LOCK_TEXT /* FIXME - borrowed from arm32 - check*/ |
70 | *(.fixup) | 70 | *(.fixup) |
@@ -111,7 +111,7 @@ SECTIONS | |||
111 | /* | 111 | /* |
112 | * and the usual data section | 112 | * and the usual data section |
113 | */ | 113 | */ |
114 | *(.data) | 114 | DATA_DATA |
115 | CONSTRUCTORS | 115 | CONSTRUCTORS |
116 | 116 | ||
117 | *(.init.data) | 117 | *(.init.data) |
diff --git a/arch/arm26/kernel/vmlinux-arm26.lds.in b/arch/arm26/kernel/vmlinux-arm26.lds.in index 1d2949e83be..6c44f6a17bf 100644 --- a/arch/arm26/kernel/vmlinux-arm26.lds.in +++ b/arch/arm26/kernel/vmlinux-arm26.lds.in | |||
@@ -65,7 +65,7 @@ SECTIONS | |||
65 | 65 | ||
66 | .text : { /* Real text segment */ | 66 | .text : { /* Real text segment */ |
67 | _text = .; /* Text and read-only data */ | 67 | _text = .; /* Text and read-only data */ |
68 | *(.text) | 68 | TEXT_TEXT |
69 | SCHED_TEXT | 69 | SCHED_TEXT |
70 | LOCK_TEXT | 70 | LOCK_TEXT |
71 | *(.fixup) | 71 | *(.fixup) |
@@ -106,7 +106,7 @@ SECTIONS | |||
106 | /* | 106 | /* |
107 | * and the usual data section | 107 | * and the usual data section |
108 | */ | 108 | */ |
109 | *(.data) | 109 | DATA_DATA |
110 | CONSTRUCTORS | 110 | CONSTRUCTORS |
111 | 111 | ||
112 | _edata = .; | 112 | _edata = .; |
diff --git a/arch/avr32/kernel/vmlinux.lds.c b/arch/avr32/kernel/vmlinux.lds.c index e7f72c995a3..db0438f35c0 100644 --- a/arch/avr32/kernel/vmlinux.lds.c +++ b/arch/avr32/kernel/vmlinux.lds.c | |||
@@ -76,7 +76,7 @@ SECTIONS | |||
76 | . = 0x100; | 76 | . = 0x100; |
77 | *(.scall.text) | 77 | *(.scall.text) |
78 | *(.irq.text) | 78 | *(.irq.text) |
79 | *(.text) | 79 | TEXT_TEXT |
80 | SCHED_TEXT | 80 | SCHED_TEXT |
81 | LOCK_TEXT | 81 | LOCK_TEXT |
82 | KPROBES_TEXT | 82 | KPROBES_TEXT |
@@ -112,7 +112,7 @@ SECTIONS | |||
112 | 112 | ||
113 | /* And the rest... */ | 113 | /* And the rest... */ |
114 | *(.data.rel*) | 114 | *(.data.rel*) |
115 | *(.data) | 115 | DATA_DATA |
116 | CONSTRUCTORS | 116 | CONSTRUCTORS |
117 | 117 | ||
118 | _edata = .; | 118 | _edata = .; |
diff --git a/arch/blackfin/kernel/vmlinux.lds.S b/arch/blackfin/kernel/vmlinux.lds.S index 6ae9ebbd8e5..86fe6799580 100644 --- a/arch/blackfin/kernel/vmlinux.lds.S +++ b/arch/blackfin/kernel/vmlinux.lds.S | |||
@@ -54,7 +54,7 @@ SECTIONS | |||
54 | { | 54 | { |
55 | _text = .; | 55 | _text = .; |
56 | __stext = .; | 56 | __stext = .; |
57 | *(.text) | 57 | TEXT_TEXT |
58 | SCHED_TEXT | 58 | SCHED_TEXT |
59 | *(.text.lock) | 59 | *(.text.lock) |
60 | . = ALIGN(16); | 60 | . = ALIGN(16); |
@@ -200,7 +200,7 @@ SECTIONS | |||
200 | __sdata = .; | 200 | __sdata = .; |
201 | . = ALIGN(0x2000); | 201 | . = ALIGN(0x2000); |
202 | *(.data.init_task) | 202 | *(.data.init_task) |
203 | *(.data) | 203 | DATA_DATA |
204 | 204 | ||
205 | . = ALIGN(32); | 205 | . = ALIGN(32); |
206 | *(.data.cacheline_aligned) | 206 | *(.data.cacheline_aligned) |
diff --git a/arch/frv/kernel/vmlinux.lds.S b/arch/frv/kernel/vmlinux.lds.S index 28eae9735ad..481dc137464 100644 --- a/arch/frv/kernel/vmlinux.lds.S +++ b/arch/frv/kernel/vmlinux.lds.S | |||
@@ -101,13 +101,14 @@ SECTIONS | |||
101 | _stext = .; | 101 | _stext = .; |
102 | .text : { | 102 | .text : { |
103 | *( | 103 | *( |
104 | .text.start .text .text.* | 104 | .text.start .text.* |
105 | #ifdef CONFIG_DEBUG_INFO | 105 | #ifdef CONFIG_DEBUG_INFO |
106 | .init.text | 106 | .init.text |
107 | .exit.text | 107 | .exit.text |
108 | .exitcall.exit | 108 | .exitcall.exit |
109 | #endif | 109 | #endif |
110 | ) | 110 | ) |
111 | TEXT_TEXT | ||
111 | SCHED_TEXT | 112 | SCHED_TEXT |
112 | LOCK_TEXT | 113 | LOCK_TEXT |
113 | *(.fixup) | 114 | *(.fixup) |
@@ -135,7 +136,8 @@ SECTIONS | |||
135 | 136 | ||
136 | _sdata = .; | 137 | _sdata = .; |
137 | .data : { /* Data */ | 138 | .data : { /* Data */ |
138 | *(.data .data.*) | 139 | DATA_DATA |
140 | *(.data.*) | ||
139 | *(.exit.data) | 141 | *(.exit.data) |
140 | CONSTRUCTORS | 142 | CONSTRUCTORS |
141 | } | 143 | } |
diff --git a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S index 65f1cdc5ee0..a2e72d49555 100644 --- a/arch/h8300/kernel/vmlinux.lds.S +++ b/arch/h8300/kernel/vmlinux.lds.S | |||
@@ -75,7 +75,7 @@ SECTIONS | |||
75 | *(.int_redirect) | 75 | *(.int_redirect) |
76 | #endif | 76 | #endif |
77 | __stext = . ; | 77 | __stext = . ; |
78 | *(.text) | 78 | TEXT_TEXT |
79 | SCHED_TEXT | 79 | SCHED_TEXT |
80 | LOCK_TEXT | 80 | LOCK_TEXT |
81 | __etext = . ; | 81 | __etext = . ; |
@@ -103,7 +103,7 @@ SECTIONS | |||
103 | . = ALIGN(0x2000) ; | 103 | . = ALIGN(0x2000) ; |
104 | *(.data.init_task) | 104 | *(.data.init_task) |
105 | . = ALIGN(0x4) ; | 105 | . = ALIGN(0x4) ; |
106 | *(.data) | 106 | DATA_DATA |
107 | . = ALIGN(0x4) ; | 107 | . = ALIGN(0x4) ; |
108 | *(.data.*) | 108 | *(.data.*) |
109 | 109 | ||
diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/i386/kernel/vmlinux.lds.S index 80bec664023..aa87b06c7c8 100644 --- a/arch/i386/kernel/vmlinux.lds.S +++ b/arch/i386/kernel/vmlinux.lds.S | |||
@@ -44,7 +44,7 @@ SECTIONS | |||
44 | 44 | ||
45 | /* read-only */ | 45 | /* read-only */ |
46 | .text : AT(ADDR(.text) - LOAD_OFFSET) { | 46 | .text : AT(ADDR(.text) - LOAD_OFFSET) { |
47 | *(.text) | 47 | TEXT_TEXT |
48 | SCHED_TEXT | 48 | SCHED_TEXT |
49 | LOCK_TEXT | 49 | LOCK_TEXT |
50 | KPROBES_TEXT | 50 | KPROBES_TEXT |
@@ -74,7 +74,7 @@ SECTIONS | |||
74 | /* writeable */ | 74 | /* writeable */ |
75 | . = ALIGN(4096); | 75 | . = ALIGN(4096); |
76 | .data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */ | 76 | .data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */ |
77 | *(.data) | 77 | DATA_DATA |
78 | CONSTRUCTORS | 78 | CONSTRUCTORS |
79 | } :data | 79 | } :data |
80 | 80 | ||
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 69238264211..5a65965c8b5 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S | |||
@@ -44,7 +44,7 @@ SECTIONS | |||
44 | .text : AT(ADDR(.text) - LOAD_OFFSET) | 44 | .text : AT(ADDR(.text) - LOAD_OFFSET) |
45 | { | 45 | { |
46 | IVT_TEXT | 46 | IVT_TEXT |
47 | *(.text) | 47 | TEXT_TEXT |
48 | SCHED_TEXT | 48 | SCHED_TEXT |
49 | LOCK_TEXT | 49 | LOCK_TEXT |
50 | KPROBES_TEXT | 50 | KPROBES_TEXT |
@@ -214,7 +214,12 @@ SECTIONS | |||
214 | 214 | ||
215 | data : { } :data | 215 | data : { } :data |
216 | .data : AT(ADDR(.data) - LOAD_OFFSET) | 216 | .data : AT(ADDR(.data) - LOAD_OFFSET) |
217 | { *(.data) *(.data1) *(.gnu.linkonce.d*) CONSTRUCTORS } | 217 | { |
218 | DATA_DATA | ||
219 | *(.data1) | ||
220 | *(.gnu.linkonce.d*) | ||
221 | CONSTRUCTORS | ||
222 | } | ||
218 | 223 | ||
219 | . = ALIGN(16); /* gp must be 16-byte aligned for exc. table */ | 224 | . = ALIGN(16); /* gp must be 16-byte aligned for exc. table */ |
220 | .got : AT(ADDR(.got) - LOAD_OFFSET) | 225 | .got : AT(ADDR(.got) - LOAD_OFFSET) |
diff --git a/arch/m32r/kernel/vmlinux.lds.S b/arch/m32r/kernel/vmlinux.lds.S index 6c73bca3f47..4e2d5b9f0a9 100644 --- a/arch/m32r/kernel/vmlinux.lds.S +++ b/arch/m32r/kernel/vmlinux.lds.S | |||
@@ -27,7 +27,7 @@ SECTIONS | |||
27 | _text = .; /* Text and read-only data */ | 27 | _text = .; /* Text and read-only data */ |
28 | .boot : { *(.boot) } = 0 | 28 | .boot : { *(.boot) } = 0 |
29 | .text : { | 29 | .text : { |
30 | *(.text) | 30 | TEXT_TEXT |
31 | SCHED_TEXT | 31 | SCHED_TEXT |
32 | LOCK_TEXT | 32 | LOCK_TEXT |
33 | *(.fixup) | 33 | *(.fixup) |
@@ -50,7 +50,7 @@ SECTIONS | |||
50 | .data : { /* Data */ | 50 | .data : { /* Data */ |
51 | *(.spu) | 51 | *(.spu) |
52 | *(.spi) | 52 | *(.spi) |
53 | *(.data) | 53 | DATA_DATA |
54 | CONSTRUCTORS | 54 | CONSTRUCTORS |
55 | } | 55 | } |
56 | 56 | ||
diff --git a/arch/m68k/kernel/vmlinux-std.lds b/arch/m68k/kernel/vmlinux-std.lds index 437b4f8d86c..78f139226a1 100644 --- a/arch/m68k/kernel/vmlinux-std.lds +++ b/arch/m68k/kernel/vmlinux-std.lds | |||
@@ -11,7 +11,7 @@ SECTIONS | |||
11 | . = 0x1000; | 11 | . = 0x1000; |
12 | _text = .; /* Text and read-only data */ | 12 | _text = .; /* Text and read-only data */ |
13 | .text : { | 13 | .text : { |
14 | *(.text) | 14 | TEXT_TEXT |
15 | SCHED_TEXT | 15 | SCHED_TEXT |
16 | LOCK_TEXT | 16 | LOCK_TEXT |
17 | *(.fixup) | 17 | *(.fixup) |
@@ -28,7 +28,7 @@ SECTIONS | |||
28 | _etext = .; /* End of text section */ | 28 | _etext = .; /* End of text section */ |
29 | 29 | ||
30 | .data : { /* Data */ | 30 | .data : { /* Data */ |
31 | *(.data) | 31 | DATA_DATA |
32 | CONSTRUCTORS | 32 | CONSTRUCTORS |
33 | } | 33 | } |
34 | 34 | ||
diff --git a/arch/m68k/kernel/vmlinux-sun3.lds b/arch/m68k/kernel/vmlinux-sun3.lds index 2868e206fc7..c8999b2db23 100644 --- a/arch/m68k/kernel/vmlinux-sun3.lds +++ b/arch/m68k/kernel/vmlinux-sun3.lds | |||
@@ -12,7 +12,7 @@ SECTIONS | |||
12 | _text = .; /* Text and read-only data */ | 12 | _text = .; /* Text and read-only data */ |
13 | .text : { | 13 | .text : { |
14 | *(.head) | 14 | *(.head) |
15 | *(.text) | 15 | TEXT_TEXT |
16 | SCHED_TEXT | 16 | SCHED_TEXT |
17 | LOCK_TEXT | 17 | LOCK_TEXT |
18 | *(.fixup) | 18 | *(.fixup) |
@@ -23,7 +23,7 @@ SECTIONS | |||
23 | _etext = .; /* End of text section */ | 23 | _etext = .; /* End of text section */ |
24 | 24 | ||
25 | .data : { /* Data */ | 25 | .data : { /* Data */ |
26 | *(.data) | 26 | DATA_DATA |
27 | CONSTRUCTORS | 27 | CONSTRUCTORS |
28 | . = ALIGN(16); /* Exception table */ | 28 | . = ALIGN(16); /* Exception table */ |
29 | __start___ex_table = .; | 29 | __start___ex_table = .; |
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S index c86a1bf589d..07a0055602f 100644 --- a/arch/m68knommu/kernel/vmlinux.lds.S +++ b/arch/m68knommu/kernel/vmlinux.lds.S | |||
@@ -62,7 +62,7 @@ SECTIONS { | |||
62 | .text : { | 62 | .text : { |
63 | _text = .; | 63 | _text = .; |
64 | _stext = . ; | 64 | _stext = . ; |
65 | *(.text) | 65 | TEXT_TEXT |
66 | SCHED_TEXT | 66 | SCHED_TEXT |
67 | *(.text.lock) | 67 | *(.text.lock) |
68 | 68 | ||
@@ -133,7 +133,7 @@ SECTIONS { | |||
133 | .data DATA_ADDR : { | 133 | .data DATA_ADDR : { |
134 | . = ALIGN(4); | 134 | . = ALIGN(4); |
135 | _sdata = . ; | 135 | _sdata = . ; |
136 | *(.data) | 136 | DATA_DATA |
137 | . = ALIGN(8192) ; | 137 | . = ALIGN(8192) ; |
138 | *(.data.init_task) | 138 | *(.data.init_task) |
139 | _edata = . ; | 139 | _edata = . ; |
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S index 043f637e3d1..9b9992cd562 100644 --- a/arch/mips/kernel/vmlinux.lds.S +++ b/arch/mips/kernel/vmlinux.lds.S | |||
@@ -27,7 +27,7 @@ SECTIONS | |||
27 | /* read-only */ | 27 | /* read-only */ |
28 | _text = .; /* Text and read-only data */ | 28 | _text = .; /* Text and read-only data */ |
29 | .text : { | 29 | .text : { |
30 | *(.text) | 30 | TEXT_TEXT |
31 | SCHED_TEXT | 31 | SCHED_TEXT |
32 | LOCK_TEXT | 32 | LOCK_TEXT |
33 | *(.fixup) | 33 | *(.fixup) |
@@ -62,7 +62,7 @@ SECTIONS | |||
62 | . = ALIGN(_PAGE_SIZE); | 62 | . = ALIGN(_PAGE_SIZE); |
63 | *(.data.init_task) | 63 | *(.data.init_task) |
64 | 64 | ||
65 | *(.data) | 65 | DATA_DATA |
66 | 66 | ||
67 | CONSTRUCTORS | 67 | CONSTRUCTORS |
68 | } | 68 | } |
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index c7458599059..4d96ba4b984 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S | |||
@@ -51,7 +51,7 @@ SECTIONS | |||
51 | 51 | ||
52 | _text = .; /* Text and read-only data */ | 52 | _text = .; /* Text and read-only data */ |
53 | .text ALIGN(16) : { | 53 | .text ALIGN(16) : { |
54 | *(.text) | 54 | TEXT_TEXT |
55 | SCHED_TEXT | 55 | SCHED_TEXT |
56 | LOCK_TEXT | 56 | LOCK_TEXT |
57 | *(.text.do_softirq) | 57 | *(.text.do_softirq) |
@@ -91,7 +91,7 @@ SECTIONS | |||
91 | 91 | ||
92 | . = ALIGN(L1_CACHE_BYTES); | 92 | . = ALIGN(L1_CACHE_BYTES); |
93 | .data : { /* Data */ | 93 | .data : { /* Data */ |
94 | *(.data) | 94 | DATA_DATA |
95 | CONSTRUCTORS | 95 | CONSTRUCTORS |
96 | } | 96 | } |
97 | 97 | ||
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 13206731314..f7d7bf19e4f 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S | |||
@@ -34,7 +34,8 @@ SECTIONS | |||
34 | /* Text and gots */ | 34 | /* Text and gots */ |
35 | .text : { | 35 | .text : { |
36 | _text = .; | 36 | _text = .; |
37 | *(.text .text.*) | 37 | *(.text.*) |
38 | TEXT_TEXT | ||
38 | SCHED_TEXT | 39 | SCHED_TEXT |
39 | LOCK_TEXT | 40 | LOCK_TEXT |
40 | KPROBES_TEXT | 41 | KPROBES_TEXT |
@@ -167,7 +168,7 @@ SECTIONS | |||
167 | #ifdef CONFIG_PPC32 | 168 | #ifdef CONFIG_PPC32 |
168 | .data : | 169 | .data : |
169 | { | 170 | { |
170 | *(.data) | 171 | DATA_DATA |
171 | *(.sdata) | 172 | *(.sdata) |
172 | *(.got.plt) *(.got) | 173 | *(.got.plt) *(.got) |
173 | } | 174 | } |
diff --git a/arch/ppc/kernel/vmlinux.lds.S b/arch/ppc/kernel/vmlinux.lds.S index 44cd128fb71..19db8746ff1 100644 --- a/arch/ppc/kernel/vmlinux.lds.S +++ b/arch/ppc/kernel/vmlinux.lds.S | |||
@@ -32,7 +32,7 @@ SECTIONS | |||
32 | .text : | 32 | .text : |
33 | { | 33 | { |
34 | _text = .; | 34 | _text = .; |
35 | *(.text) | 35 | TEXT_TEXT |
36 | SCHED_TEXT | 36 | SCHED_TEXT |
37 | LOCK_TEXT | 37 | LOCK_TEXT |
38 | *(.fixup) | 38 | *(.fixup) |
@@ -67,7 +67,7 @@ SECTIONS | |||
67 | . = ALIGN(4096); | 67 | . = ALIGN(4096); |
68 | .data : | 68 | .data : |
69 | { | 69 | { |
70 | *(.data) | 70 | DATA_DATA |
71 | *(.data1) | 71 | *(.data1) |
72 | *(.sdata) | 72 | *(.sdata) |
73 | *(.sdata2) | 73 | *(.sdata2) |
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index e9d3432aba6..7158a804a5e 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S | |||
@@ -21,7 +21,7 @@ SECTIONS | |||
21 | . = 0x00000000; | 21 | . = 0x00000000; |
22 | _text = .; /* Text and read-only data */ | 22 | _text = .; /* Text and read-only data */ |
23 | .text : { | 23 | .text : { |
24 | *(.text) | 24 | TEXT_TEXT |
25 | SCHED_TEXT | 25 | SCHED_TEXT |
26 | LOCK_TEXT | 26 | LOCK_TEXT |
27 | KPROBES_TEXT | 27 | KPROBES_TEXT |
@@ -48,7 +48,7 @@ SECTIONS | |||
48 | BUG_TABLE | 48 | BUG_TABLE |
49 | 49 | ||
50 | .data : { /* Data */ | 50 | .data : { /* Data */ |
51 | *(.data) | 51 | DATA_DATA |
52 | CONSTRUCTORS | 52 | CONSTRUCTORS |
53 | } | 53 | } |
54 | 54 | ||
diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S index d83143cc5ca..4c5b57e9c3c 100644 --- a/arch/sh/kernel/vmlinux.lds.S +++ b/arch/sh/kernel/vmlinux.lds.S | |||
@@ -22,7 +22,7 @@ SECTIONS | |||
22 | *(.empty_zero_page) | 22 | *(.empty_zero_page) |
23 | } = 0 | 23 | } = 0 |
24 | .text : { | 24 | .text : { |
25 | *(.text) | 25 | TEXT_TEXT |
26 | SCHED_TEXT | 26 | SCHED_TEXT |
27 | LOCK_TEXT | 27 | LOCK_TEXT |
28 | *(.fixup) | 28 | *(.fixup) |
@@ -41,7 +41,7 @@ SECTIONS | |||
41 | BUG_TABLE | 41 | BUG_TABLE |
42 | 42 | ||
43 | .data : { /* Data */ | 43 | .data : { /* Data */ |
44 | *(.data) | 44 | DATA_DATA |
45 | 45 | ||
46 | /* Align the initial ramdisk image (INITRD) on page boundaries. */ | 46 | /* Align the initial ramdisk image (INITRD) on page boundaries. */ |
47 | . = ALIGN(PAGE_SIZE); | 47 | . = ALIGN(PAGE_SIZE); |
diff --git a/arch/sh64/kernel/vmlinux.lds.S b/arch/sh64/kernel/vmlinux.lds.S index 4f9616f3983..02aea86c590 100644 --- a/arch/sh64/kernel/vmlinux.lds.S +++ b/arch/sh64/kernel/vmlinux.lds.S | |||
@@ -54,7 +54,7 @@ SECTIONS | |||
54 | } = 0 | 54 | } = 0 |
55 | 55 | ||
56 | .text : C_PHYS(.text) { | 56 | .text : C_PHYS(.text) { |
57 | *(.text) | 57 | TEXT_TEXT |
58 | *(.text64) | 58 | *(.text64) |
59 | *(.text..SHmedia32) | 59 | *(.text..SHmedia32) |
60 | SCHED_TEXT | 60 | SCHED_TEXT |
@@ -78,7 +78,7 @@ SECTIONS | |||
78 | _etext = .; /* End of text section */ | 78 | _etext = .; /* End of text section */ |
79 | 79 | ||
80 | .data : C_PHYS(.data) { /* Data */ | 80 | .data : C_PHYS(.data) { /* Data */ |
81 | *(.data) | 81 | DATA_DATA |
82 | CONSTRUCTORS | 82 | CONSTRUCTORS |
83 | } | 83 | } |
84 | 84 | ||
diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S index f0bb6e60e62..f75a1b82278 100644 --- a/arch/sparc/kernel/vmlinux.lds.S +++ b/arch/sparc/kernel/vmlinux.lds.S | |||
@@ -12,7 +12,7 @@ SECTIONS | |||
12 | .text 0xf0004000 : | 12 | .text 0xf0004000 : |
13 | { | 13 | { |
14 | _text = .; | 14 | _text = .; |
15 | *(.text) | 15 | TEXT_TEXT |
16 | SCHED_TEXT | 16 | SCHED_TEXT |
17 | LOCK_TEXT | 17 | LOCK_TEXT |
18 | *(.gnu.warning) | 18 | *(.gnu.warning) |
@@ -22,7 +22,7 @@ SECTIONS | |||
22 | RODATA | 22 | RODATA |
23 | .data : | 23 | .data : |
24 | { | 24 | { |
25 | *(.data) | 25 | DATA_DATA |
26 | CONSTRUCTORS | 26 | CONSTRUCTORS |
27 | } | 27 | } |
28 | .data1 : { *(.data1) } | 28 | .data1 : { *(.data1) } |
diff --git a/arch/sparc64/kernel/vmlinux.lds.S b/arch/sparc64/kernel/vmlinux.lds.S index 13fa2a2e451..fb648de18a8 100644 --- a/arch/sparc64/kernel/vmlinux.lds.S +++ b/arch/sparc64/kernel/vmlinux.lds.S | |||
@@ -14,7 +14,7 @@ SECTIONS | |||
14 | .text 0x0000000000404000 : | 14 | .text 0x0000000000404000 : |
15 | { | 15 | { |
16 | _text = .; | 16 | _text = .; |
17 | *(.text) | 17 | TEXT_TEXT |
18 | SCHED_TEXT | 18 | SCHED_TEXT |
19 | LOCK_TEXT | 19 | LOCK_TEXT |
20 | KPROBES_TEXT | 20 | KPROBES_TEXT |
@@ -27,7 +27,7 @@ SECTIONS | |||
27 | 27 | ||
28 | .data : | 28 | .data : |
29 | { | 29 | { |
30 | *(.data) | 30 | DATA_DATA |
31 | CONSTRUCTORS | 31 | CONSTRUCTORS |
32 | } | 32 | } |
33 | .data1 : { *(.data1) } | 33 | .data1 : { *(.data1) } |
diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S index 87a4e4427d8..24547741b20 100644 --- a/arch/um/kernel/dyn.lds.S +++ b/arch/um/kernel/dyn.lds.S | |||
@@ -62,7 +62,7 @@ SECTIONS | |||
62 | } =0x90909090 | 62 | } =0x90909090 |
63 | .plt : { *(.plt) } | 63 | .plt : { *(.plt) } |
64 | .text : { | 64 | .text : { |
65 | *(.text) | 65 | TEXT_TEXT |
66 | SCHED_TEXT | 66 | SCHED_TEXT |
67 | LOCK_TEXT | 67 | LOCK_TEXT |
68 | *(.fixup) | 68 | *(.fixup) |
@@ -99,7 +99,8 @@ SECTIONS | |||
99 | *(.data.init_task) | 99 | *(.data.init_task) |
100 | . = ALIGN(KERNEL_STACK_SIZE); | 100 | . = ALIGN(KERNEL_STACK_SIZE); |
101 | *(.data.init_irqstack) | 101 | *(.data.init_irqstack) |
102 | *(.data .data.* .gnu.linkonce.d.*) | 102 | DATA_DATA |
103 | *(.data.* .gnu.linkonce.d.*) | ||
103 | SORT(CONSTRUCTORS) | 104 | SORT(CONSTRUCTORS) |
104 | } | 105 | } |
105 | .data1 : { *(.data1) } | 106 | .data1 : { *(.data1) } |
diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S index bc59f97e34d..307b9373676 100644 --- a/arch/um/kernel/uml.lds.S +++ b/arch/um/kernel/uml.lds.S | |||
@@ -37,7 +37,7 @@ SECTIONS | |||
37 | 37 | ||
38 | .text : | 38 | .text : |
39 | { | 39 | { |
40 | *(.text) | 40 | TEXT_TEXT |
41 | SCHED_TEXT | 41 | SCHED_TEXT |
42 | LOCK_TEXT | 42 | LOCK_TEXT |
43 | *(.fixup) | 43 | *(.fixup) |
@@ -61,7 +61,7 @@ SECTIONS | |||
61 | *(.data.init_task) | 61 | *(.data.init_task) |
62 | . = ALIGN(KERNEL_STACK_SIZE); | 62 | . = ALIGN(KERNEL_STACK_SIZE); |
63 | *(.data.init_irqstack) | 63 | *(.data.init_irqstack) |
64 | *(.data) | 64 | DATA_DATA |
65 | *(.gnu.linkonce.d*) | 65 | *(.gnu.linkonce.d*) |
66 | CONSTRUCTORS | 66 | CONSTRUCTORS |
67 | } | 67 | } |
diff --git a/arch/v850/kernel/vmlinux.lds.S b/arch/v850/kernel/vmlinux.lds.S index 35630822125..6172599b4ce 100644 --- a/arch/v850/kernel/vmlinux.lds.S +++ b/arch/v850/kernel/vmlinux.lds.S | |||
@@ -92,7 +92,7 @@ | |||
92 | #define TEXT_CONTENTS \ | 92 | #define TEXT_CONTENTS \ |
93 | _text = .; \ | 93 | _text = .; \ |
94 | __stext = . ; \ | 94 | __stext = . ; \ |
95 | *(.text) \ | 95 | TEXT_TEXT \ |
96 | SCHED_TEXT \ | 96 | SCHED_TEXT \ |
97 | *(.exit.text) /* 2.5 convention */ \ | 97 | *(.exit.text) /* 2.5 convention */ \ |
98 | *(.text.exit) /* 2.4 convention */ \ | 98 | *(.text.exit) /* 2.4 convention */ \ |
@@ -113,7 +113,7 @@ | |||
113 | /* Kernel data segment. */ | 113 | /* Kernel data segment. */ |
114 | #define DATA_CONTENTS \ | 114 | #define DATA_CONTENTS \ |
115 | __sdata = . ; \ | 115 | __sdata = . ; \ |
116 | *(.data) \ | 116 | DATA_DATA \ |
117 | *(.exit.data) /* 2.5 convention */ \ | 117 | *(.exit.data) /* 2.5 convention */ \ |
118 | *(.data.exit) /* 2.4 convention */ \ | 118 | *(.data.exit) /* 2.4 convention */ \ |
119 | . = ALIGN (16) ; \ | 119 | . = ALIGN (16) ; \ |
diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S index 88cfa50b424..dbccfda8364 100644 --- a/arch/x86_64/kernel/vmlinux.lds.S +++ b/arch/x86_64/kernel/vmlinux.lds.S | |||
@@ -31,7 +31,7 @@ SECTIONS | |||
31 | *(.bootstrap.text) | 31 | *(.bootstrap.text) |
32 | _stext = .; | 32 | _stext = .; |
33 | /* Then the rest */ | 33 | /* Then the rest */ |
34 | *(.text) | 34 | TEXT_TEXT |
35 | SCHED_TEXT | 35 | SCHED_TEXT |
36 | LOCK_TEXT | 36 | LOCK_TEXT |
37 | KPROBES_TEXT | 37 | KPROBES_TEXT |
@@ -55,7 +55,7 @@ SECTIONS | |||
55 | . = ALIGN(PAGE_SIZE); /* Align data segment to page size boundary */ | 55 | . = ALIGN(PAGE_SIZE); /* Align data segment to page size boundary */ |
56 | /* Data */ | 56 | /* Data */ |
57 | .data : AT(ADDR(.data) - LOAD_OFFSET) { | 57 | .data : AT(ADDR(.data) - LOAD_OFFSET) { |
58 | *(.data) | 58 | DATA_DATA |
59 | CONSTRUCTORS | 59 | CONSTRUCTORS |
60 | } :data | 60 | } :data |
61 | 61 | ||
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S index 4fbd66a52a8..4b7b4ff7997 100644 --- a/arch/xtensa/kernel/vmlinux.lds.S +++ b/arch/xtensa/kernel/vmlinux.lds.S | |||
@@ -84,7 +84,8 @@ SECTIONS | |||
84 | { | 84 | { |
85 | /* The .head.text section must be the first section! */ | 85 | /* The .head.text section must be the first section! */ |
86 | *(.head.text) | 86 | *(.head.text) |
87 | *(.literal .text) | 87 | *(.literal) |
88 | TEXT_TEXT | ||
88 | *(.srom.text) | 89 | *(.srom.text) |
89 | VMLINUX_SYMBOL(__sched_text_start) = .; | 90 | VMLINUX_SYMBOL(__sched_text_start) = .; |
90 | *(.sched.literal .sched.text) | 91 | *(.sched.literal .sched.text) |
@@ -144,7 +145,8 @@ SECTIONS | |||
144 | _fdata = .; | 145 | _fdata = .; |
145 | .data : | 146 | .data : |
146 | { | 147 | { |
147 | *(.data) CONSTRUCTORS | 148 | DATA_DATA |
149 | CONSTRUCTORS | ||
148 | . = ALIGN(XCHAL_ICACHE_LINESIZE); | 150 | . = ALIGN(XCHAL_ICACHE_LINESIZE); |
149 | *(.data.cacheline_aligned) | 151 | *(.data.cacheline_aligned) |
150 | } | 152 | } |