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-arm946.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-arm946.S')
-rw-r--r-- | arch/arm/mm/proc-arm946.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S index a60c1421d450..2218b0c01330 100644 --- a/arch/arm/mm/proc-arm946.S +++ b/arch/arm/mm/proc-arm946.S | |||
@@ -376,6 +376,7 @@ __arm946_setup: | |||
376 | .type arm946_processor_functions, #object | 376 | .type arm946_processor_functions, #object |
377 | ENTRY(arm946_processor_functions) | 377 | ENTRY(arm946_processor_functions) |
378 | .word nommu_early_abort | 378 | .word nommu_early_abort |
379 | .word pabort_noifar | ||
379 | .word cpu_arm946_proc_init | 380 | .word cpu_arm946_proc_init |
380 | .word cpu_arm946_proc_fin | 381 | .word cpu_arm946_proc_fin |
381 | .word cpu_arm946_reset | 382 | .word cpu_arm946_reset |