diff options
author | Tim Abbott <tabbott@MIT.EDU> | 2009-04-27 14:02:22 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-27 22:51:58 -0400 |
commit | 991da17ec0b9f396154c8120ffd10e5d7d7aa361 (patch) | |
tree | e53b6ce7d3482afb516e806bfc69966a6af0b7c0 /arch/arm | |
parent | df1f6d200c1e20788184251c49f349b38d90889c (diff) |
arm: Use __INIT macro instead of .text.init.
arm is placing some code in the .text.init section, but it does not
reference that section in its linker scripts.
This change moves this code from the .text.init section to the
.init.text section, which is presumably where it belongs.
Signed-off-by: Tim Abbott <tabbott@mit.edu>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mm/proc-v6.S | 3 | ||||
-rw-r--r-- | arch/arm/mm/proc-v7.S | 3 | ||||
-rw-r--r-- | arch/arm/mm/tlb-v6.S | 3 | ||||
-rw-r--r-- | arch/arm/mm/tlb-v7.S | 3 |
4 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index f0cc599facb7..087e239704df 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S | |||
@@ -10,6 +10,7 @@ | |||
10 | * | 10 | * |
11 | * This is the "shell" of the ARMv6 processor support. | 11 | * This is the "shell" of the ARMv6 processor support. |
12 | */ | 12 | */ |
13 | #include <linux/init.h> | ||
13 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
14 | #include <asm/assembler.h> | 15 | #include <asm/assembler.h> |
15 | #include <asm/asm-offsets.h> | 16 | #include <asm/asm-offsets.h> |
@@ -132,7 +133,7 @@ cpu_v6_name: | |||
132 | .asciz "ARMv6-compatible processor" | 133 | .asciz "ARMv6-compatible processor" |
133 | .align | 134 | .align |
134 | 135 | ||
135 | .section ".text.init", #alloc, #execinstr | 136 | __INIT |
136 | 137 | ||
137 | /* | 138 | /* |
138 | * __v6_setup | 139 | * __v6_setup |
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index d1ebec42521d..c221e26ac1d3 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S | |||
@@ -9,6 +9,7 @@ | |||
9 | * | 9 | * |
10 | * This is the "shell" of the ARMv7 processor support. | 10 | * This is the "shell" of the ARMv7 processor support. |
11 | */ | 11 | */ |
12 | #include <linux/init.h> | ||
12 | #include <linux/linkage.h> | 13 | #include <linux/linkage.h> |
13 | #include <asm/assembler.h> | 14 | #include <asm/assembler.h> |
14 | #include <asm/asm-offsets.h> | 15 | #include <asm/asm-offsets.h> |
@@ -153,7 +154,7 @@ cpu_v7_name: | |||
153 | .ascii "ARMv7 Processor" | 154 | .ascii "ARMv7 Processor" |
154 | .align | 155 | .align |
155 | 156 | ||
156 | .section ".text.init", #alloc, #execinstr | 157 | __INIT |
157 | 158 | ||
158 | /* | 159 | /* |
159 | * __v7_setup | 160 | * __v7_setup |
diff --git a/arch/arm/mm/tlb-v6.S b/arch/arm/mm/tlb-v6.S index 20f84bbaa9bb..73d7d89b04c4 100644 --- a/arch/arm/mm/tlb-v6.S +++ b/arch/arm/mm/tlb-v6.S | |||
@@ -10,6 +10,7 @@ | |||
10 | * ARM architecture version 6 TLB handling functions. | 10 | * ARM architecture version 6 TLB handling functions. |
11 | * These assume a split I/D TLB. | 11 | * These assume a split I/D TLB. |
12 | */ | 12 | */ |
13 | #include <linux/init.h> | ||
13 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
14 | #include <asm/asm-offsets.h> | 15 | #include <asm/asm-offsets.h> |
15 | #include <asm/page.h> | 16 | #include <asm/page.h> |
@@ -87,7 +88,7 @@ ENTRY(v6wbi_flush_kern_tlb_range) | |||
87 | mcr p15, 0, r2, c7, c5, 4 @ prefetch flush | 88 | mcr p15, 0, r2, c7, c5, 4 @ prefetch flush |
88 | mov pc, lr | 89 | mov pc, lr |
89 | 90 | ||
90 | .section ".text.init", #alloc, #execinstr | 91 | __INIT |
91 | 92 | ||
92 | .type v6wbi_tlb_fns, #object | 93 | .type v6wbi_tlb_fns, #object |
93 | ENTRY(v6wbi_tlb_fns) | 94 | ENTRY(v6wbi_tlb_fns) |
diff --git a/arch/arm/mm/tlb-v7.S b/arch/arm/mm/tlb-v7.S index 24ba5109f2e7..b637e7380ab7 100644 --- a/arch/arm/mm/tlb-v7.S +++ b/arch/arm/mm/tlb-v7.S | |||
@@ -11,6 +11,7 @@ | |||
11 | * ARM architecture version 6 TLB handling functions. | 11 | * ARM architecture version 6 TLB handling functions. |
12 | * These assume a split I/D TLB. | 12 | * These assume a split I/D TLB. |
13 | */ | 13 | */ |
14 | #include <linux/init.h> | ||
14 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
15 | #include <asm/asm-offsets.h> | 16 | #include <asm/asm-offsets.h> |
16 | #include <asm/page.h> | 17 | #include <asm/page.h> |
@@ -80,7 +81,7 @@ ENTRY(v7wbi_flush_kern_tlb_range) | |||
80 | mov pc, lr | 81 | mov pc, lr |
81 | ENDPROC(v7wbi_flush_kern_tlb_range) | 82 | ENDPROC(v7wbi_flush_kern_tlb_range) |
82 | 83 | ||
83 | .section ".text.init", #alloc, #execinstr | 84 | __INIT |
84 | 85 | ||
85 | .type v7wbi_tlb_fns, #object | 86 | .type v7wbi_tlb_fns, #object |
86 | ENTRY(v7wbi_tlb_fns) | 87 | ENTRY(v7wbi_tlb_fns) |