From: Pavel Machek <pavel@ucw.cz>
Date: Tue, 19 Feb 2008 10:02:30 +0000 (+0100)
Subject: x86: notsc is ignored on common configurations
X-Git-Tag: v2.6.25-rc4~159^2~12
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=7265b6f10deba1cbe071cee646b063bda07ecd68;p=linux-2.6-omap-h63xx.git

x86: notsc is ignored on common configurations

notsc is ignored in 32-bit kernels if CONFIG_X86_TSC is on.. which is
bad, fix it.

Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c
index 43517e324be..f14cfd9d1f9 100644
--- a/arch/x86/kernel/tsc_32.c
+++ b/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