public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [TRIVIAL] [PATCH] notsc-warning_A0
@ 2002-08-19 21:53 john stultz
  0 siblings, 0 replies; only message in thread
From: john stultz @ 2002-08-19 21:53 UTC (permalink / raw)
  To: marcelo; +Cc: Alan Cox, lkml

Marcelo, 
	This patch simply prints a warning message when "notsc" is passed to a
kernel that is compiled w/ CONFIG_X86_TSC, and thus ignores the boot
option (Also renames tsc_setup -> notsc_setup).

thanks
-john

diff -Nru a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
--- a/arch/i386/kernel/setup.c	Mon Aug 19 14:49:55 2002
+++ b/arch/i386/kernel/setup.c	Mon Aug 19 14:49:55 2002
@@ -1138,14 +1138,19 @@
 #ifndef CONFIG_X86_TSC
 static int tsc_disable __initdata = 0;
 
-static int __init tsc_setup(char *str)
+static int __init notsc_setup(char *str)
 {
 	tsc_disable = 1;
 	return 1;
 }
-
-__setup("notsc", tsc_setup);
+#else
+static int __init notsc_setup(char *str)
+{
+	printk("notsc: Kernel compiled with CONFIG_X86_TSC, cannot disable TSC.\n");
+	return 1;
+}
 #endif
+__setup("notsc", notsc_setup);
 
 static int __init highio_setup(char *str)
 {


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2002-08-19 22:04 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2002-08-19 21:53 [TRIVIAL] [PATCH] notsc-warning_A0 john stultz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox