---

yaml --- r: 23999 b: refs/heads/master c: 0b5c59a h: refs/heads/master i: 23997: 7af7472 23995: 95f3a0b 23991: 48d21c5 23983: 0fce221 23967: 258e1d4 23935: 219debd v: v3
git-mirror · Mar 26, 2006 · dceb140 · dceb140
1 parent 5eb9eb6
commit dceb140
Show file tree

Hide file tree

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