---

yaml --- r: 109981 b: refs/heads/master c: 09bfeea h: refs/heads/master i: 109979: 0dc2fa2 v: v3
git-mirror · Sep 23, 2008 · 46d8669 · 46d8669
1 parent 30af2c8
commit 46d8669
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8d6829044901a67732904be5f1eacdf8539604f
+refs/heads/master: 09bfeea13cea843fb03eaa96b5d891fa0abdcc90
diff --git a/trunk/arch/x86/kernel/process.c b/trunk/arch/x86/kernel/process.c
@@ -270,8 +270,9 @@ static void c1e_idle(void)
 		rdmsr(MSR_K8_INT_PENDING_MSG, lo, hi);
 		if (lo & K8_INTP_C1E_ACTIVE_MASK) {
 			c1e_detected = 1;
-			mark_tsc_unstable("TSC halt in C1E");
-			printk(KERN_INFO "System has C1E enabled\n");
+			if (!boot_cpu_has(X86_FEATURE_CONSTANT_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);
 		}
 	}