projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[deliverable/linux.git]
/
drivers
/
acpi
/
processor_idle.c
diff --git
a/drivers/acpi/processor_idle.c
b/drivers/acpi/processor_idle.c
index 5f8d746a9b8198e516321ccdaaa8c5a1486b39b7..38aca048e9515a6f0be0b36f6db9475cbaa889b3 100644
(file)
--- 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:
{
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.
*/
/*
* 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;
return 0;
+
/*FALL THROUGH*/
/*FALL THROUGH*/
- case X86_VENDOR_INTEL:
- /* Several cases known where TSC halts in C2 too */
default:
return state > ACPI_STATE_C1;
}
default:
return state > ACPI_STATE_C1;
}
This page took
0.024176 seconds
and
5
git commands to generate.