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-v6.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-v6.S')
-rw-r--r-- | arch/arm/mm/proc-v6.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index bf760ea2f789..5702ec58b2a2 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S | |||
@@ -219,6 +219,7 @@ v6_crval: | |||
219 | .type v6_processor_functions, #object | 219 | .type v6_processor_functions, #object |
220 | ENTRY(v6_processor_functions) | 220 | ENTRY(v6_processor_functions) |
221 | .word v6_early_abort | 221 | .word v6_early_abort |
222 | .word pabort_noifar | ||
222 | .word cpu_v6_proc_init | 223 | .word cpu_v6_proc_init |
223 | .word cpu_v6_proc_fin | 224 | .word cpu_v6_proc_fin |
224 | .word cpu_v6_reset | 225 | .word cpu_v6_reset |
@@ -226,7 +227,6 @@ ENTRY(v6_processor_functions) | |||
226 | .word cpu_v6_dcache_clean_area | 227 | .word cpu_v6_dcache_clean_area |
227 | .word cpu_v6_switch_mm | 228 | .word cpu_v6_switch_mm |
228 | .word cpu_v6_set_pte_ext | 229 | .word cpu_v6_set_pte_ext |
229 | .word pabort_noifar | ||
230 | .size v6_processor_functions, . - v6_processor_functions | 230 | .size v6_processor_functions, . - v6_processor_functions |
231 | 231 | ||
232 | .type cpu_arch_name, #object | 232 | .type cpu_arch_name, #object |