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>
This commit is contained in:
Родитель
df1f6d200c
Коммит
991da17ec0
|
@ -10,6 +10,7 @@
|
||||||
*
|
*
|
||||||
* This is the "shell" of the ARMv6 processor support.
|
* This is the "shell" of the ARMv6 processor support.
|
||||||
*/
|
*/
|
||||||
|
#include <linux/init.h>
|
||||||
#include <linux/linkage.h>
|
#include <linux/linkage.h>
|
||||||
#include <asm/assembler.h>
|
#include <asm/assembler.h>
|
||||||
#include <asm/asm-offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
|
@ -132,7 +133,7 @@ cpu_v6_name:
|
||||||
.asciz "ARMv6-compatible processor"
|
.asciz "ARMv6-compatible processor"
|
||||||
.align
|
.align
|
||||||
|
|
||||||
.section ".text.init", #alloc, #execinstr
|
__INIT
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* __v6_setup
|
* __v6_setup
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
*
|
*
|
||||||
* This is the "shell" of the ARMv7 processor support.
|
* This is the "shell" of the ARMv7 processor support.
|
||||||
*/
|
*/
|
||||||
|
#include <linux/init.h>
|
||||||
#include <linux/linkage.h>
|
#include <linux/linkage.h>
|
||||||
#include <asm/assembler.h>
|
#include <asm/assembler.h>
|
||||||
#include <asm/asm-offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
|
@ -153,7 +154,7 @@ cpu_v7_name:
|
||||||
.ascii "ARMv7 Processor"
|
.ascii "ARMv7 Processor"
|
||||||
.align
|
.align
|
||||||
|
|
||||||
.section ".text.init", #alloc, #execinstr
|
__INIT
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* __v7_setup
|
* __v7_setup
|
||||||
|
|
|
@ -10,6 +10,7 @@
|
||||||
* ARM architecture version 6 TLB handling functions.
|
* ARM architecture version 6 TLB handling functions.
|
||||||
* These assume a split I/D TLB.
|
* These assume a split I/D TLB.
|
||||||
*/
|
*/
|
||||||
|
#include <linux/init.h>
|
||||||
#include <linux/linkage.h>
|
#include <linux/linkage.h>
|
||||||
#include <asm/asm-offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
#include <asm/page.h>
|
#include <asm/page.h>
|
||||||
|
@ -87,7 +88,7 @@ ENTRY(v6wbi_flush_kern_tlb_range)
|
||||||
mcr p15, 0, r2, c7, c5, 4 @ prefetch flush
|
mcr p15, 0, r2, c7, c5, 4 @ prefetch flush
|
||||||
mov pc, lr
|
mov pc, lr
|
||||||
|
|
||||||
.section ".text.init", #alloc, #execinstr
|
__INIT
|
||||||
|
|
||||||
.type v6wbi_tlb_fns, #object
|
.type v6wbi_tlb_fns, #object
|
||||||
ENTRY(v6wbi_tlb_fns)
|
ENTRY(v6wbi_tlb_fns)
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
* ARM architecture version 6 TLB handling functions.
|
* ARM architecture version 6 TLB handling functions.
|
||||||
* These assume a split I/D TLB.
|
* These assume a split I/D TLB.
|
||||||
*/
|
*/
|
||||||
|
#include <linux/init.h>
|
||||||
#include <linux/linkage.h>
|
#include <linux/linkage.h>
|
||||||
#include <asm/asm-offsets.h>
|
#include <asm/asm-offsets.h>
|
||||||
#include <asm/page.h>
|
#include <asm/page.h>
|
||||||
|
@ -80,7 +81,7 @@ ENTRY(v7wbi_flush_kern_tlb_range)
|
||||||
mov pc, lr
|
mov pc, lr
|
||||||
ENDPROC(v7wbi_flush_kern_tlb_range)
|
ENDPROC(v7wbi_flush_kern_tlb_range)
|
||||||
|
|
||||||
.section ".text.init", #alloc, #execinstr
|
__INIT
|
||||||
|
|
||||||
.type v7wbi_tlb_fns, #object
|
.type v7wbi_tlb_fns, #object
|
||||||
ENTRY(v7wbi_tlb_fns)
|
ENTRY(v7wbi_tlb_fns)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче