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 /arch/x86/kernel/process.c | |
| parent | fa623d1b0222adbe8f822e53c08003b9679a410c (diff) | |
| parent | 7e3cbc3f774f31ecd88a51edae3d9377f60a4c00 (diff) | |
Merge branch 'x86/tsc' into x86/core
Diffstat (limited to 'arch/x86/kernel/process.c')
| -rw-r--r-- | arch/x86/kernel/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 9bfc3f719d4..b8f3e9dbabd 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -287,7 +287,7 @@ static void c1e_idle(void) rdmsr(MSR_K8_INT_PENDING_MSG, lo, hi); if (lo & K8_INTP_C1E_ACTIVE_MASK) { c1e_detected = 1; - if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) + if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC)) mark_tsc_unstable("TSC halt in AMD C1E"); printk(KERN_INFO "System has AMD C1E enabled\n"); set_cpu_cap(&boot_cpu_data, X86_FEATURE_AMDC1E); |