From dceb140caeb3c8e9aa4dfba92bc05e8ddf53cbaa Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Sun, 26 Mar 2006 02:24:07 +0100
Subject: [PATCH] --- yaml --- r: 23999 b: refs/heads/master c:
 0b5c59a1e41636afa77b90d34e8c394d8d929733 h: refs/heads/master i:   23997:
 7af7472f3023053417dcdf60205c941880ff543a   23995:
 95f3a0b617a2fed745ad7755575c20b7797fe220   23991:
 48d21c528bbba64005d261ab0ee5e85e3bcb53be   23983:
 0fce2217466a0e0568126df32d5869c506e2f37f   23967:
 258e1d47b22b029c0e8c4d84b576990b225174cf   23935:
 219debd83b2ded8c4f3d158484c28c88ab093705 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/acpi/processor_idle.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index efb3feda3343..7015fca24998 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d3aee9a9686ffc235c343dcab85c3ebea78908a
+refs/heads/master: 0b5c59a1e41636afa77b90d34e8c394d8d929733
diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c
index 2be895895943..80fa43471f48 100644
--- a/trunk/drivers/acpi/processor_idle.c
+++ b/trunk/drivers/acpi/processor_idle.c
@@ -876,10 +876,10 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
 {
 	unsigned int i;
 	unsigned int working = 0;
-	int timer_broadcast = 0;
-	cpumask_t mask = cpumask_of_cpu(pr->id);
 
 #ifdef ARCH_APICTIMER_STOPS_ON_C3
+	int timer_broadcast = 0;
+	cpumask_t mask = cpumask_of_cpu(pr->id);
 	on_each_cpu(switch_ipi_to_APIC_timer, &mask, 1, 1);
 #endif
 
@@ -915,8 +915,10 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
 			working++;
 	}
 
+#ifdef ARCH_APICTIMER_STOPS_ON_C3
 	if (timer_broadcast)
 		on_each_cpu(switch_APIC_timer_to_ipi, &mask, 1, 1);
+#endif
 
 	return (working);
 }