Messages in this thread Patch in this message | | | Date | Tue, 19 Feb 2008 11:02:30 +0100 | From | Pavel Machek <> | Subject | 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>
diff --git a/arch/x86/kernel/tsc_32.c b/arch/x86/kernel/tsc_32.c index fafd9dc..3804fbe 100644 --- a/arch/x86/kernel/tsc_32.c +++ b/arch/x86/kernel/tsc_32.c @@ -28,7 +28,8 @@ #ifdef CONFIG_X86_TSC 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 @@ -221,9 +222,9 @@ #ifdef CONFIG_CPU_FREQ * if the CPU frequency is scaled, TSC-based delays will need a different * loops_per_jiffy value to function properly. */ -static unsigned int ref_freq = 0; -static unsigned long loops_per_jiffy_ref = 0; -static unsigned long cpu_khz_ref = 0; +static unsigned int ref_freq; +static unsigned long loops_per_jiffy_ref; +static unsigned long cpu_khz_ref; static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val, void *data) @@ -285,7 +286,7 @@ #endif /* clock source code */ -static unsigned long current_tsc_khz = 0; +static unsigned long current_tsc_khz; static cycle_t read_tsc(void) { -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
| |