---

yaml --- r: 86341 b: refs/heads/master c: 7265b6f h: refs/heads/master i: 86339: 47f275d v: v3
git-mirror · Feb 26, 2008 · 6a4b28e · 6a4b28e
1 parent 4f908aa
commit 6a4b28e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5106d91f2bf9153d6420f9ebb8114f73f9ce66a
+refs/heads/master: 7265b6f10deba1cbe071cee646b063bda07ecd68
diff --git a/trunk/arch/x86/kernel/tsc_32.c b/trunk/arch/x86/kernel/tsc_32.c
@@ -28,7 +28,8 @@ EXPORT_SYMBOL_GPL(tsc_khz);
 static int __init tsc_setup(char *str)
 {
 	printk(KERN_WARNING "notsc: Kernel compiled with CONFIG_X86_TSC, "
-				"cannot disable TSC.\n");
+				"cannot disable TSC completely.\n");
+	mark_tsc_unstable("user disabled TSC");
 	return 1;
 }
 #else