[ARM] fix 48d7927bdf071d05cf5d15b816cf06b0937cb84f

The proc-*.S files have the _prefetch_abort pointer placed at the end
of the processor structure but the cpu-multi32.h defines it in the
second position. The patch also fixes the support for XSC3 and the
MMU-less CPUs (740, 7tdmi, 940, 946 and 9tdmi).

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mm/proc-arm6_7.S b/arch/arm/mm/proc-arm6_7.S
index 14b6a95c8d45..c371fc87776e 100644
--- a/arch/arm/mm/proc-arm6_7.S
+++ b/arch/arm/mm/proc-arm6_7.S
@@ -293,6 +293,7 @@ __arm7_setup:	mov	r0, #0
                 .type   arm6_processor_functions, #object
 ENTRY(arm6_processor_functions)
                 .word   cpu_arm6_data_abort
+                .word   pabort_noifar
                 .word   cpu_arm6_proc_init
                 .word   cpu_arm6_proc_fin
                 .word   cpu_arm6_reset
@@ -300,7 +301,6 @@ ENTRY(arm6_processor_functions)
                 .word   cpu_arm6_dcache_clean_area
                 .word   cpu_arm6_switch_mm
                 .word   cpu_arm6_set_pte_ext
-                .word   pabort_noifar
                 .size   arm6_processor_functions, . - arm6_processor_functions
 
 /*
@@ -310,6 +310,7 @@ ENTRY(arm6_processor_functions)
                 .type   arm7_processor_functions, #object
 ENTRY(arm7_processor_functions)
                 .word   cpu_arm7_data_abort
+                .word   pabort_noifar
                 .word   cpu_arm7_proc_init
                 .word   cpu_arm7_proc_fin
                 .word   cpu_arm7_reset
@@ -317,7 +318,6 @@ ENTRY(arm7_processor_functions)
                 .word   cpu_arm7_dcache_clean_area
                 .word   cpu_arm7_switch_mm
                 .word   cpu_arm7_set_pte_ext
-                .word   pabort_noifar
                 .size   arm7_processor_functions, . - arm7_processor_functions
 
                 .section ".rodata"