Merge branch 'next/fixes2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux...

[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 1d2b845..219138d 100644 (file)
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -56,6 +56,11 @@ ENTRY(cpu_v6_proc_fin)
  */
        .align  5
 ENTRY(cpu_v6_reset)
+       mrc     p15, 0, r1, c1, c0, 0           @ ctrl register
+       bic     r1, r1, #0x1                    @ ...............m
+       mcr     p15, 0, r1, c1, c0, 0           @ disable MMU
+       mov     r1, #0
+       mcr     p15, 0, r1, c7, c5, 4           @ ISB
        mov     pc, r0
 
 /*
@@ -164,16 +169,9 @@ ENDPROC(cpu_v6_do_resume)
 cpu_resume_l1_flags:
        ALT_SMP(.long PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_FLAGS_SMP)
        ALT_UP(.long  PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_FLAGS_UP)
-#else
-#define cpu_v6_do_suspend 0
-#define cpu_v6_do_resume 0
 #endif
 
-
-       .type   cpu_v6_name, #object
-cpu_v6_name:
-       .asciz  "ARMv6-compatible processor"
-       .size   cpu_v6_name, . - cpu_v6_name
+       string  cpu_v6_name, "ARMv6-compatible processor"
 
        .align
 
@@ -239,33 +237,13 @@ v6_crval:
 
        __INITDATA
 
-       .type   v6_processor_functions, #object
-ENTRY(v6_processor_functions)
-       .word   v6_early_abort
-       .word   v6_pabort
-       .word   cpu_v6_proc_init
-       .word   cpu_v6_proc_fin
-       .word   cpu_v6_reset
-       .word   cpu_v6_do_idle
-       .word   cpu_v6_dcache_clean_area
-       .word   cpu_v6_switch_mm
-       .word   cpu_v6_set_pte_ext
-       .word   cpu_v6_suspend_size
-       .word   cpu_v6_do_suspend
-       .word   cpu_v6_do_resume
-       .size   v6_processor_functions, . - v6_processor_functions
+       @ define struct processor (see <asm/proc-fns.h> and proc-macros.S)
+       define_processor_functions v6, dabort=v6_early_abort, pabort=v6_pabort, suspend=1
 
        .section ".rodata"
 
-       .type   cpu_arch_name, #object
-cpu_arch_name:
-       .asciz  "armv6"
-       .size   cpu_arch_name, . - cpu_arch_name
-
-       .type   cpu_elf_name, #object
-cpu_elf_name:
-       .asciz  "v6"
-       .size   cpu_elf_name, . - cpu_elf_name
+       string  cpu_arch_name, "armv6"
+       string  cpu_elf_name, "v6"
        .align
 
        .section ".proc.info.init", #alloc, #execinstr