Skip to content

Commit

Permalink
x86: notsc is ignored on common configurations
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
pavelmachek authored and Ingo Molnar committed Feb 26, 2008
1 parent f5106d9 commit 7265b6f
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion arch/x86/kernel/tsc_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7265b6f

Please sign in to comment.