Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[pandora-kernel.git] / arch / arm / mm / proc-v6.S

diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index b95662d..59a7e1f 100644 (file)
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -135,7 +135,7 @@ cpu_pj4_name:
 
        .align
 
-       __INIT
+       __CPUINIT
 
 /*
  *     __v6_setup
@@ -193,6 +193,8 @@ __v6_setup:
 v6_crval:
        crval   clear=0x01e0fb7f, mmuset=0x00c0387d, ucset=0x00c0187c
 
+       __INITDATA
+
        .type   v6_processor_functions, #object
 ENTRY(v6_processor_functions)
        .word   v6_early_abort
@@ -206,6 +208,8 @@ ENTRY(v6_processor_functions)
        .word   cpu_v6_set_pte_ext
        .size   v6_processor_functions, . - v6_processor_functions
 
+       .section ".rodata"
+
        .type   cpu_arch_name, #object
 cpu_arch_name:
        .asciz  "armv6"