From: Michael Gernoth <michael@gernoth.net>
Date: Sun, 22 May 2011 18:59:28 +0000 (+0200)
Subject: apply upstream commit 1f667c690be3ab71036c436d8391105eee23f65b
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/ms2-kexec/commitdiff_plain/1b28cbdb34d1b32241f3e1e3ba2c28fd89d96d0d?ds=sidebyside

apply upstream commit 1f667c690be3ab71036c436d8391105eee23f65b

ARM: 5886/1: arm: Fix cpu_proc_fin() for proc-v7.S and make kexec work
---

diff --git a/proc-v7.S b/proc-v7.S
index 3a28521..d2a8074 100644
--- a/proc-v7.S
+++ b/proc-v7.S
@@ -45,7 +45,14 @@ ENTRY(cpu_v7_proc_init)
 ENDPROC(cpu_v7_proc_init)
 
 ENTRY(cpu_v7_proc_fin)
-	mov	pc, lr
+	stmfd	sp!, {lr}
+	cpsid	if				@ disable interrupts
+	bl	v7_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}
 ENDPROC(cpu_v7_proc_fin)
 
 /*