Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Tim Abbott and committed by
Linus Torvalds
991da17e df1f6d20

+8 -4
+2 -1
arch/arm/mm/proc-v6.S
··· 10 10 * 11 11 * This is the "shell" of the ARMv6 processor support. 12 12 */ 13 + #include <linux/init.h> 13 14 #include <linux/linkage.h> 14 15 #include <asm/assembler.h> 15 16 #include <asm/asm-offsets.h> ··· 133 132 .asciz "ARMv6-compatible processor" 134 133 .align 135 134 136 - .section ".text.init", #alloc, #execinstr 135 + __INIT 137 136 138 137 /* 139 138 * __v6_setup
+2 -1
arch/arm/mm/proc-v7.S
··· 9 9 * 10 10 * This is the "shell" of the ARMv7 processor support. 11 11 */ 12 + #include <linux/init.h> 12 13 #include <linux/linkage.h> 13 14 #include <asm/assembler.h> 14 15 #include <asm/asm-offsets.h> ··· 154 153 .ascii "ARMv7 Processor" 155 154 .align 156 155 157 - .section ".text.init", #alloc, #execinstr 156 + __INIT 158 157 159 158 /* 160 159 * __v7_setup
+2 -1
arch/arm/mm/tlb-v6.S
··· 10 10 * ARM architecture version 6 TLB handling functions. 11 11 * These assume a split I/D TLB. 12 12 */ 13 + #include <linux/init.h> 13 14 #include <linux/linkage.h> 14 15 #include <asm/asm-offsets.h> 15 16 #include <asm/page.h> ··· 88 87 mcr p15, 0, r2, c7, c5, 4 @ prefetch flush 89 88 mov pc, lr 90 89 91 - .section ".text.init", #alloc, #execinstr 90 + __INIT 92 91 93 92 .type v6wbi_tlb_fns, #object 94 93 ENTRY(v6wbi_tlb_fns)
+2 -1
arch/arm/mm/tlb-v7.S
··· 11 11 * ARM architecture version 6 TLB handling functions. 12 12 * These assume a split I/D TLB. 13 13 */ 14 + #include <linux/init.h> 14 15 #include <linux/linkage.h> 15 16 #include <asm/asm-offsets.h> 16 17 #include <asm/page.h> ··· 81 80 mov pc, lr 82 81 ENDPROC(v7wbi_flush_kern_tlb_range) 83 82 84 - .section ".text.init", #alloc, #execinstr 83 + __INIT 85 84 86 85 .type v7wbi_tlb_fns, #object 87 86 ENTRY(v7wbi_tlb_fns)