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-arm1020e.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-arm1020e.S')
-rw-r--r-- | arch/arm/mm/proc-arm1020e.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S index fe2b0ae70274..4343fdb0e9e5 100644 --- a/arch/arm/mm/proc-arm1020e.S +++ b/arch/arm/mm/proc-arm1020e.S | |||
@@ -452,6 +452,7 @@ arm1020e_crval: | |||
452 | .type arm1020e_processor_functions, #object | 452 | .type arm1020e_processor_functions, #object |
453 | arm1020e_processor_functions: | 453 | arm1020e_processor_functions: |
454 | .word v4t_early_abort | 454 | .word v4t_early_abort |
455 | .word pabort_noifar | ||
455 | .word cpu_arm1020e_proc_init | 456 | .word cpu_arm1020e_proc_init |
456 | .word cpu_arm1020e_proc_fin | 457 | .word cpu_arm1020e_proc_fin |
457 | .word cpu_arm1020e_reset | 458 | .word cpu_arm1020e_reset |
@@ -459,7 +460,6 @@ arm1020e_processor_functions: | |||
459 | .word cpu_arm1020e_dcache_clean_area | 460 | .word cpu_arm1020e_dcache_clean_area |
460 | .word cpu_arm1020e_switch_mm | 461 | .word cpu_arm1020e_switch_mm |
461 | .word cpu_arm1020e_set_pte_ext | 462 | .word cpu_arm1020e_set_pte_ext |
462 | .word pabort_noifar | ||
463 | .size arm1020e_processor_functions, . - arm1020e_processor_functions | 463 | .size arm1020e_processor_functions, . - arm1020e_processor_functions |
464 | 464 | ||
465 | .section ".rodata" | 465 | .section ".rodata" |