Merge branch 'hotplug' into devel

Conflicts:
	arch/arm/kernel/head-common.S

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"