summaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/proc-arm720.S
diff options
context:
space:
mode:
authorCatalin Marinas <catalin.marinas@arm.com>2008-04-21 18:42:04 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-04-24 10:06:45 +0100
commit4a1fd556c1f1fbd6d9d6739efec042324732b697 (patch)
tree0175c078b97e3e74249a07df619280832fa06b37 /arch/arm/mm/proc-arm720.S
parent328d8a012583f0c25f8db25a2e5e63b521201542 (diff)
downloadlinux-stable-4a1fd556c1f1fbd6d9d6739efec042324732b697.tar.gz
linux-stable-4a1fd556c1f1fbd6d9d6739efec042324732b697.tar.bz2
linux-stable-4a1fd556c1f1fbd6d9d6739efec042324732b697.zip
[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-arm720.S')
-rw-r--r--arch/arm/mm/proc-arm720.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
index ca5e7aac2da7..d64f8e6f75ab 100644
--- a/arch/arm/mm/proc-arm720.S
+++ b/arch/arm/mm/proc-arm720.S
@@ -198,6 +198,7 @@ arm720_crval:
.type arm720_processor_functions, #object
ENTRY(arm720_processor_functions)
.word v4t_late_abort
+ .word pabort_noifar
.word cpu_arm720_proc_init
.word cpu_arm720_proc_fin
.word cpu_arm720_reset
@@ -205,7 +206,6 @@ ENTRY(arm720_processor_functions)
.word cpu_arm720_dcache_clean_area
.word cpu_arm720_switch_mm
.word cpu_arm720_set_pte_ext
- .word pabort_noifar
.size arm720_processor_functions, . - arm720_processor_functions
.section ".rodata"