From 6a4b28e70b2519f18318ce780c3bc17042de4fa1 Mon Sep 17 00:00:00 2001
From: Pavel Machek <pavel@ucw.cz>
Date: Tue, 19 Feb 2008 11:02:30 +0100
Subject: [PATCH] --- yaml --- r: 86341 b: refs/heads/master c:
 7265b6f10deba1cbe071cee646b063bda07ecd68 h: refs/heads/master i:   86339:
 47f275d2945a3d2110e392aa3f6eb3d7dad9772a v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/kernel/tsc_32.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4b2694113f78..fd4f74884d40 100644
--- 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
index 43517e324be8..f14cfd9d1f94 100644
--- 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