projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
[linux-2.6-block.git]
/
include
/
asm-x86
/
acpi.h
diff --git
a/include/asm-x86/acpi.h
b/include/asm-x86/acpi.h
index bd76299586b33610b154777a0bc988e526d65541..392e17336be1dede3964b6e61ca4cdf568b258fd 100644
(file)
--- a/
include/asm-x86/acpi.h
+++ b/
include/asm-x86/acpi.h
@@
-140,6
+140,8
@@
static inline unsigned int acpi_processor_cstate_check(unsigned int max_cstate)
boot_cpu_data.x86_model <= 0x05 &&
boot_cpu_data.x86_mask < 0x0A)
return 1;
+ else if (boot_cpu_has(X86_FEATURE_AMDC1E))
+ return 1;
else
return max_cstate;
}