From db61b5b25409cc6c6b13d49d43c07c6ce96369b8 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Mon, 20 Dec 2010 16:58:19 +0000
Subject: [PATCH] --- yaml --- r: 225897 b: refs/heads/master c:
 faabfa0816916b0a7cfc93f6a9be382830658c80 h: refs/heads/master i:   225895:
 42fb3bd9b03cad823ae7296e24de8cedd919e813 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/arm/kernel/smp.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 673df4ffc953..3c153c8784db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 03b505eae6a276b8c38b6222694afb6cea10b1cc
+refs/heads/master: faabfa0816916b0a7cfc93f6a9be382830658c80
diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c
index 6d0c66bc434d..5341b0b19701 100644
--- a/trunk/arch/arm/kernel/smp.c
+++ b/trunk/arch/arm/kernel/smp.c
@@ -286,6 +286,7 @@ void __ref cpu_die(void)
 	 * to be repeated to undo the effects of taking the CPU offline.
 	 */
 	__asm__("mov	sp, %0\n"
+	"	mov	fp, #0\n"
 	"	b	secondary_start_kernel"
 		:
 		: "r" (task_stack_page(current) + THREAD_SIZE - 8));