summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorVenkatesh Pallipadi <venkatesh.pallipadi@intel.com>2006-02-03 21:50:47 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-05 01:43:13 +0100
commit76b461c21468f41837283b7888d55f1c0671f719 (patch)
tree3df6a35fe789dbc70db4ae6e32c8e694079e97d8 /drivers/acpi
parent[PATCH] x86_64: Define pmtmr_ioport to 0 when PM_TIMER is not available (diff)
downloadlinux-76b461c21468f41837283b7888d55f1c0671f719.tar.xz
linux-76b461c21468f41837283b7888d55f1c0671f719.zip
[PATCH] x86_64: Only switch to IPI broadcast timer on Intel when C3 is supported
Bug in apic timer removal on C3 patch. We should switch to IPI from APIC timer only when C3 state is valid. Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/processor_idle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index be2dae52f6fa..3bfca093a870 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -899,7 +899,7 @@ static int acpi_processor_power_verify(struct acpi_processor *pr)
case ACPI_STATE_C3:
acpi_processor_power_verify_c3(pr, cx);
#ifdef ARCH_APICTIMER_STOPS_ON_C3
- if (c->x86_vendor == X86_VENDOR_INTEL) {
+ if (cx->valid && c->x86_vendor == X86_VENDOR_INTEL) {
on_each_cpu(switch_APIC_timer_to_ipi,
&mask, 1, 1);
}