Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7265b6f1 authored by Pavel Machek's avatar Pavel Machek Committed by Ingo Molnar
Browse files

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: default avatarPavel Machek <pavel@suse.cz>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f5106d91

arch/x86/kernel/tsc_32.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,8 @@ EXPORT_SYMBOL_GPL(tsc_khz); 
static int __init tsc_setup(char *str)

static int __init tsc_setup(char *str)

{

{

	printk(KERN_WARNING "notsc: Kernel compiled with CONFIG_X86_TSC, "

	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;

	return 1;

}

}

#else

#else