Skip to content

Commit

Permalink
arm: Use __INIT macro instead of .text.init.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tim Abbott authored and Linus Torvalds committed Apr 28, 2009
1 parent df1f6d2 commit 991da17
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
3 changes: 2 additions & 1 deletion arch/arm/mm/proc-v6.S
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*
* This is the "shell" of the ARMv6 processor support.
*/
#include <linux/init.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/asm-offsets.h>
Expand Down Expand Up @@ -132,7 +133,7 @@ cpu_v6_name:
.asciz "ARMv6-compatible processor"
.align

.section ".text.init", #alloc, #execinstr
__INIT

/*
* __v6_setup
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mm/proc-v7.S
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*
* This is the "shell" of the ARMv7 processor support.
*/
#include <linux/init.h>
#include <linux/linkage.h>
#include <asm/assembler.h>
#include <asm/asm-offsets.h>
Expand Down Expand Up @@ -153,7 +154,7 @@ cpu_v7_name:
.ascii "ARMv7 Processor"
.align

.section ".text.init", #alloc, #execinstr
__INIT

/*
* __v7_setup
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mm/tlb-v6.S
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
* ARM architecture version 6 TLB handling functions.
* These assume a split I/D TLB.
*/
#include <linux/init.h>
#include <linux/linkage.h>
#include <asm/asm-offsets.h>
#include <asm/page.h>
Expand Down Expand Up @@ -87,7 +88,7 @@ ENTRY(v6wbi_flush_kern_tlb_range)
mcr p15, 0, r2, c7, c5, 4 @ prefetch flush
mov pc, lr

.section ".text.init", #alloc, #execinstr
__INIT

.type v6wbi_tlb_fns, #object
ENTRY(v6wbi_tlb_fns)
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/mm/tlb-v7.S
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* ARM architecture version 6 TLB handling functions.
* These assume a split I/D TLB.
*/
#include <linux/init.h>
#include <linux/linkage.h>
#include <asm/asm-offsets.h>
#include <asm/page.h>
Expand Down Expand Up @@ -80,7 +81,7 @@ ENTRY(v7wbi_flush_kern_tlb_range)
mov pc, lr
ENDPROC(v7wbi_flush_kern_tlb_range)

.section ".text.init", #alloc, #execinstr
__INIT

.type v7wbi_tlb_fns, #object
ENTRY(v7wbi_tlb_fns)
Expand Down

0 comments on commit 991da17

Please sign in to comment.