---

yaml --- r: 216743 b: refs/heads/master c: 6931be0 h: refs/heads/master i: 216741: 684e9f5 216739: 7912208 216735: b53b831 v: v3
git-mirror · Oct 25, 2010 · 923e86a · 923e86a
1 parent 27f05fc
commit 923e86a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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();