diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-23 23:26:42 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-23 23:26:42 +0200 |
| commit | 07bbc16a8676b06950a21f35b59f69b2fe763bbd (patch) | |
| tree | f87fbfea747e9d92591c8d0a54db7c487e3c3d78 /include/asm-x86/acpi.h | |
| parent | 6a9e91846bf52cc70a0417de19fdfac224c435c4 (diff) | |
| parent | f8e256c687eb53850685747757c8d75e58756e15 (diff) | |
Merge branch 'timers/urgent' into x86/xen
Conflicts:
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
Manual merge:
arch/x86/kernel/smpboot.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/acpi.h')
| -rw-r--r-- | include/asm-x86/acpi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/acpi.h b/include/asm-x86/acpi.h index 635d764dc13..35d1743b57a 100644 --- 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; } |