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-xscale.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-xscale.S')
-rw-r--r-- | arch/arm/mm/proc-xscale.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S index 1a6d89823dff..2dd85273976f 100644 --- a/arch/arm/mm/proc-xscale.S +++ b/arch/arm/mm/proc-xscale.S | |||
@@ -527,6 +527,7 @@ xscale_crval: | |||
527 | .type xscale_processor_functions, #object | 527 | .type xscale_processor_functions, #object |
528 | ENTRY(xscale_processor_functions) | 528 | ENTRY(xscale_processor_functions) |
529 | .word v5t_early_abort | 529 | .word v5t_early_abort |
530 | .word pabort_noifar | ||
530 | .word cpu_xscale_proc_init | 531 | .word cpu_xscale_proc_init |
531 | .word cpu_xscale_proc_fin | 532 | .word cpu_xscale_proc_fin |
532 | .word cpu_xscale_reset | 533 | .word cpu_xscale_reset |
@@ -534,7 +535,6 @@ ENTRY(xscale_processor_functions) | |||
534 | .word cpu_xscale_dcache_clean_area | 535 | .word cpu_xscale_dcache_clean_area |
535 | .word cpu_xscale_switch_mm | 536 | .word cpu_xscale_switch_mm |
536 | .word cpu_xscale_set_pte_ext | 537 | .word cpu_xscale_set_pte_ext |
537 | .word pabort_noifar | ||
538 | .size xscale_processor_functions, . - xscale_processor_functions | 538 | .size xscale_processor_functions, . - xscale_processor_functions |
539 | 539 | ||
540 | .section ".rodata" | 540 | .section ".rodata" |