diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2008-04-21 13:42:04 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-24 05:06:45 -0400 |
commit | 4a1fd556c1f1fbd6d9d6739efec042324732b697 (patch) | |
tree | 0175c078b97e3e74249a07df619280832fa06b37 /arch/arm/mm/proc-arm925.S | |
parent | 328d8a012583f0c25f8db25a2e5e63b521201542 (diff) |
[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>
Diffstat (limited to 'arch/arm/mm/proc-arm925.S')
-rw-r--r-- | arch/arm/mm/proc-arm925.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S index e2988eba4cf6..065087afb772 100644 --- a/arch/arm/mm/proc-arm925.S +++ b/arch/arm/mm/proc-arm925.S | |||
@@ -484,6 +484,7 @@ arm925_crval: | |||
484 | .type arm925_processor_functions, #object | 484 | .type arm925_processor_functions, #object |
485 | arm925_processor_functions: | 485 | arm925_processor_functions: |
486 | .word v4t_early_abort | 486 | .word v4t_early_abort |
487 | .word pabort_noifar | ||
487 | .word cpu_arm925_proc_init | 488 | .word cpu_arm925_proc_init |
488 | .word cpu_arm925_proc_fin | 489 | .word cpu_arm925_proc_fin |
489 | .word cpu_arm925_reset | 490 | .word cpu_arm925_reset |
@@ -491,7 +492,6 @@ arm925_processor_functions: | |||
491 | .word cpu_arm925_dcache_clean_area | 492 | .word cpu_arm925_dcache_clean_area |
492 | .word cpu_arm925_switch_mm | 493 | .word cpu_arm925_switch_mm |
493 | .word cpu_arm925_set_pte_ext | 494 | .word cpu_arm925_set_pte_ext |
494 | .word pabort_noifar | ||
495 | .size arm925_processor_functions, . - arm925_processor_functions | 495 | .size arm925_processor_functions, . - arm925_processor_functions |
496 | 496 | ||
497 | .section ".rodata" | 497 | .section ".rodata" |