From 1c051f3d66025fa8f3640719971097afb4b87f02 Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Thu, 25 Dec 2008 13:39:27 +0100
Subject: [PATCH] --- yaml --- r: 121409 b: refs/heads/master c:
 33b1d09ef317d64c58b135c2e811bb55b3f15b19 h: refs/heads/master i:   121407:
 b8f1b7030ad29dcd2fad9bb8a9aefd0d53d70ca0 v: v3

---
 [refs]                       | 2 +-
 trunk/arch/s390/kernel/smp.c | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 016e0b28868d..da56c734de41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f7e90d6d61fa0e56821787521c12f8a626c4037
+refs/heads/master: 33b1d09ef317d64c58b135c2e811bb55b3f15b19
diff --git a/trunk/arch/s390/kernel/smp.c b/trunk/arch/s390/kernel/smp.c
index bf170c698f0c..1e7db1ab7453 100644
--- a/trunk/arch/s390/kernel/smp.c
+++ b/trunk/arch/s390/kernel/smp.c
@@ -500,18 +500,15 @@ static int __cpuinit smp_alloc_lowcore(int cpu)
 
 		save_area = get_zeroed_page(GFP_KERNEL);
 		if (!save_area)
-			goto out_save_area;
+			goto out;
 		lowcore->extended_save_area_addr = (u32) save_area;
 	}
 #endif
 	lowcore_ptr[cpu] = lowcore;
 	return 0;
 
-#ifndef CONFIG_64BIT
-out_save_area:
-	free_page(panic_stack);
-#endif
 out:
+	free_page(panic_stack);
 	free_pages(async_stack, ASYNC_ORDER);
 	free_pages((unsigned long) lowcore, lc_order);
 	return -ENOMEM;