diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:30:20 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:30:20 +0100 |
| commit | be9a1d3c2e559b267983bcf8b003997b83befb49 (patch) | |
| tree | 4aea3e82ed63e918e83f470970e760fcaf42782f /drivers | |
| parent | fa623d1b0222adbe8f822e53c08003b9679a410c (diff) | |
| parent | 7e3cbc3f774f31ecd88a51edae3d9377f60a4c00 (diff) | |
| download | blackbird-obmc-linux-be9a1d3c2e559b267983bcf8b003997b83befb49.tar.gz blackbird-obmc-linux-be9a1d3c2e559b267983bcf8b003997b83befb49.zip | |
Merge branch 'x86/tsc' into x86/core
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 5f8d746a9b81..38aca048e951 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -374,15 +374,15 @@ static int tsc_halts_in_c(int state) { switch (boot_cpu_data.x86_vendor) { case X86_VENDOR_AMD: + case X86_VENDOR_INTEL: /* * AMD Fam10h TSC will tick in all * C/P/S0/S1 states when this bit is set. */ - if (boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) + if (boot_cpu_has(X86_FEATURE_NONSTOP_TSC)) return 0; + /*FALL THROUGH*/ - case X86_VENDOR_INTEL: - /* Several cases known where TSC halts in C2 too */ default: return state > ACPI_STATE_C1; } |
