From 923e86a1869754b34748f9df9252a53a9ebe09b8 Mon Sep 17 00:00:00 2001
From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 25 Oct 2010 16:10:12 +0200
Subject: [PATCH] --- yaml --- r: 216743 b: refs/heads/master c:
 6931be0803ddae2791f3c646c8e1e0f82ca26013 h: refs/heads/master i:   216741:
 684e9f5c48b443cee60ac10abd86e6112f1464d0   216739:
 7912208b8d0075a9318a0d28916a3b229bed37af   216735:
 b53b8317b46c61ed3fe94276562aba69f5f415fe v: v3

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

diff --git a/[refs] b/[refs]
index b4f0c01d8a27..e65f30f8a9ed 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80217147a3d80c8a4e48f06e2f6e965455f3fe2a
+refs/heads/master: 6931be0803ddae2791f3c646c8e1e0f82ca26013
diff --git a/trunk/arch/s390/kernel/process.c b/trunk/arch/s390/kernel/process.c
index d3a2d1c6438e..ec2e03b22ead 100644
--- a/trunk/arch/s390/kernel/process.c
+++ b/trunk/arch/s390/kernel/process.c
@@ -76,17 +76,17 @@ unsigned long thread_saved_pc(struct task_struct *tsk)
 static void default_idle(void)
 {
 	/* CPU is going idle. */
-	local_irq_disable();
-	if (need_resched()) {
-		local_irq_enable();
-		return;
-	}
 #ifdef CONFIG_HOTPLUG_CPU
 	if (cpu_is_offline(smp_processor_id())) {
 		preempt_enable_no_resched();
 		cpu_die();
 	}
 #endif
+	local_irq_disable();
+	if (need_resched()) {
+		local_irq_enable();
+		return;
+	}
 	local_mcck_disable();
 	if (test_thread_flag(TIF_MCCK_PENDING)) {
 		local_mcck_enable();