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-v7.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-v7.S')
-rw-r--r-- | arch/arm/mm/proc-v7.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index a1d7331cd64c..b49f9a4c82c8 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S | |||
@@ -205,6 +205,7 @@ __v7_setup_stack: | |||
205 | .type v7_processor_functions, #object | 205 | .type v7_processor_functions, #object |
206 | ENTRY(v7_processor_functions) | 206 | ENTRY(v7_processor_functions) |
207 | .word v7_early_abort | 207 | .word v7_early_abort |
208 | .word pabort_ifar | ||
208 | .word cpu_v7_proc_init | 209 | .word cpu_v7_proc_init |
209 | .word cpu_v7_proc_fin | 210 | .word cpu_v7_proc_fin |
210 | .word cpu_v7_reset | 211 | .word cpu_v7_reset |
@@ -212,7 +213,6 @@ ENTRY(v7_processor_functions) | |||
212 | .word cpu_v7_dcache_clean_area | 213 | .word cpu_v7_dcache_clean_area |
213 | .word cpu_v7_switch_mm | 214 | .word cpu_v7_switch_mm |
214 | .word cpu_v7_set_pte_ext | 215 | .word cpu_v7_set_pte_ext |
215 | .word pabort_ifar | ||
216 | .size v7_processor_functions, . - v7_processor_functions | 216 | .size v7_processor_functions, . - v7_processor_functions |
217 | 217 | ||
218 | .type cpu_arch_name, #object | 218 | .type cpu_arch_name, #object |