Commit 97842216 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

Allow softlockup to be runtime disabled

It's useful sometimes to disable the softlockup checker at boottime.
Especially if it triggers during a distro install.
Signed-off-by: default avatarDave Jones <davej@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ea5a3dcf
...@@ -1181,6 +1181,8 @@ and is between 256 and 4096 characters. It is defined in the file ...@@ -1181,6 +1181,8 @@ and is between 256 and 4096 characters. It is defined in the file
nosmp [SMP] Tells an SMP kernel to act as a UP kernel. nosmp [SMP] Tells an SMP kernel to act as a UP kernel.
nosoftlockup [KNL] Disable the soft-lockup detector.
nosync [HW,M68K] Disables sync negotiation for all devices. nosync [HW,M68K] Disables sync negotiation for all devices.
notsc [BUGS=IA-32] Disable Time Stamp Counter notsc [BUGS=IA-32] Disable Time Stamp Counter
......
...@@ -728,6 +728,15 @@ static void __init do_basic_setup(void) ...@@ -728,6 +728,15 @@ static void __init do_basic_setup(void)
do_initcalls(); do_initcalls();
} }
static int __initdata nosoftlockup;
static int __init nosoftlockup_setup(char *str)
{
nosoftlockup = 1;
return 1;
}
__setup("nosoftlockup", nosoftlockup_setup);
static void __init do_pre_smp_initcalls(void) static void __init do_pre_smp_initcalls(void)
{ {
extern int spawn_ksoftirqd(void); extern int spawn_ksoftirqd(void);
...@@ -737,7 +746,8 @@ static void __init do_pre_smp_initcalls(void) ...@@ -737,7 +746,8 @@ static void __init do_pre_smp_initcalls(void)
migration_init(); migration_init();
#endif #endif
spawn_ksoftirqd(); spawn_ksoftirqd();
spawn_softlockup_task(); if (!nosoftlockup)
spawn_softlockup_task();
} }
static void run_init_process(char *init_filename) static void run_init_process(char *init_filename)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment