From 613bd015569cc6f256a9a071a008b1348180f50a Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Wed, 24 Sep 2008 22:56:25 +0000
Subject: [PATCH] --- yaml --- r: 110094 b: refs/heads/master c:
 61e9916eba35dfb76d38013a5aae9a59cc50877a h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0b26ec5896c8..47ff07f941c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad611045ce5d059af84a9855b22ca3f7a99d47be
+refs/heads/master: 61e9916eba35dfb76d38013a5aae9a59cc50877a
diff --git a/trunk/arch/powerpc/kernel/idle.c b/trunk/arch/powerpc/kernel/idle.c
index d308a9f70f1b..31982d05d81a 100644
--- a/trunk/arch/powerpc/kernel/idle.c
+++ b/trunk/arch/powerpc/kernel/idle.c
@@ -34,11 +34,7 @@
 #include <asm/smp.h>
 
 #ifdef CONFIG_HOTPLUG_CPU
-/* this is used for software suspend, and that shuts down
- * CPUs even while the system is still booting... */
-#define cpu_should_die()	(cpu_is_offline(smp_processor_id()) && \
-				   (system_state == SYSTEM_RUNNING     \
-				 || system_state == SYSTEM_BOOTING))
+#define cpu_should_die()	cpu_is_offline(smp_processor_id())
 #else
 #define cpu_should_die()	0
 #endif