summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-20 08:12:03 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-20 08:12:03 +0200
commit26baeba8ddfb23bb295807ebc387c98f47f60fd9 (patch)
tree17bb4da6c15e92a30157752cabe10848a84479e2 /arch
parent[PATCH] swiotlb: make sure initial DMA allocations really are in DMA memory (diff)
parent[ARM] 3024/1: Add cpu_v6_proc_fin (diff)
downloadlinux-26baeba8ddfb23bb295807ebc387c98f47f60fd9.tar.xz
linux-26baeba8ddfb23bb295807ebc387c98f47f60fd9.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mm/proc-v6.S9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index caf3b19b167f..9bb5fff406fb 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -55,7 +55,14 @@ ENTRY(cpu_v6_proc_init)
mov pc, lr
ENTRY(cpu_v6_proc_fin)
- mov pc, lr
+ stmfd sp!, {lr}
+ cpsid if @ disable interrupts
+ bl v6_flush_kern_cache_all
+ mrc p15, 0, r0, c1, c0, 0 @ ctrl register
+ bic r0, r0, #0x1000 @ ...i............
+ bic r0, r0, #0x0006 @ .............ca.
+ mcr p15, 0, r0, c1, c0, 0 @ disable caches
+ ldmfd sp!, {pc}
/*
* cpu_v6_reset(loc)