summaryrefslogtreecommitdiff
path: root/arch/arm/mm/proc-v7.S
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-18 22:34:47 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-18 22:34:47 +0100
commita0a55682b83fd5f012afadcf415b030d7424ae68 (patch)
tree97ad3cb7e3443f09fbe55f57d3c36994b20a8e52 /arch/arm/mm/proc-v7.S
parent23beab76b490172a9ff3d52843e4d27a35b2a4c6 (diff)
parent865a4fae7793b80e2b8bca76e279d6dfecbeac17 (diff)
Merge branch 'hotplug' into devel
Conflicts: arch/arm/kernel/head-common.S
Diffstat (limited to 'arch/arm/mm/proc-v7.S')
-rw-r--r--arch/arm/mm/proc-v7.S6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index df422fee1cb6..055e9d50d015 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -168,7 +168,7 @@ cpu_v7_name:
.ascii "ARMv7 Processor"
.align
- __INIT
+ __CPUINIT
/*
* __v7_setup
@@ -325,6 +325,8 @@ v7_crval:
__v7_setup_stack:
.space 4 * 11 @ 11 registers
+ __INITDATA
+
.type v7_processor_functions, #object
ENTRY(v7_processor_functions)
.word v7_early_abort
@@ -338,6 +340,8 @@ ENTRY(v7_processor_functions)
.word cpu_v7_set_pte_ext
.size v7_processor_functions, . - v7_processor_functions
+ .section ".rodata"
+
.type cpu_arch_name, #object
cpu_arch_name:
.asciz "armv7"