From e853a377013e1d18314ed1eb63babbe18ffdf563 Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Sun, 21 Dec 2008 21:54:45 +0100
Subject: [PATCH] --- yaml --- r: 127659 b: refs/heads/master c:
 870029a682d468585a80ce782871f3f220cfef0f h: refs/heads/master i:   127657:
 f22cbb3bbc62a0c0912a47cddee579881f777c3c   127655:
 6e9bbcc54e9d932f7cc99de109373b2cd1a8f76f v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/powerpc/platforms/85xx/smp.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c86286cbbb2a..ba9fe230749c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8bd3947afda14625bff8c067b760840abfb51358
+refs/heads/master: 870029a682d468585a80ce782871f3f220cfef0f
diff --git a/trunk/arch/powerpc/platforms/85xx/smp.c b/trunk/arch/powerpc/platforms/85xx/smp.c
index d652c713f496..79a0df17078b 100644
--- a/trunk/arch/powerpc/platforms/85xx/smp.c
+++ b/trunk/arch/powerpc/platforms/85xx/smp.c
@@ -58,6 +58,7 @@ smp_85xx_kick_cpu(int nr)
 
 	if (cpu_rel_addr == NULL) {
 		printk(KERN_ERR "No cpu-release-addr for cpu %d\n", nr);
+		local_irq_restore(flags);
 		return;
 	}