diff options
Diffstat (limited to 'drivers/acpi')
-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) | |||
374 | { | 374 | { |
375 | switch (boot_cpu_data.x86_vendor) { | 375 | switch (boot_cpu_data.x86_vendor) { |
376 | case X86_VENDOR_AMD: | 376 | case X86_VENDOR_AMD: |
377 | case X86_VENDOR_INTEL: | ||
377 | /* | 378 | /* |
378 | * AMD Fam10h TSC will tick in all | 379 | * AMD Fam10h TSC will tick in all |
379 | * C/P/S0/S1 states when this bit is set. | 380 | * C/P/S0/S1 states when this bit is set. |
380 | */ | 381 | */ |
381 | if (boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) | 382 | if (boot_cpu_has(X86_FEATURE_NONSTOP_TSC)) |
382 | return 0; | 383 | return 0; |
384 | |||
383 | /*FALL THROUGH*/ | 385 | /*FALL THROUGH*/ |
384 | case X86_VENDOR_INTEL: | ||
385 | /* Several cases known where TSC halts in C2 too */ | ||
386 | default: | 386 | default: |
387 | return state > ACPI_STATE_C1; | 387 | return state > ACPI_STATE_C1; |
388 | } | 388 | } |