Skip to content

Commit

Permalink
Allow softlockup to be runtime disabled
Browse files Browse the repository at this point in the history
It's useful sometimes to disable the softlockup checker at boottime.
Especially if it triggers during a distro install.

Signed-off-by: Dave Jones <[email protected]>
Cc: Ingo Molnar <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
Dave Jones authored and Linus Torvalds committed Jul 16, 2007
1 parent ea5a3dc commit 9784221
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 2 additions & 0 deletions Documentation/kernel-parameters.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

nosoftlockup [KNL] Disable the soft-lockup detector.

nosync [HW,M68K] Disables sync negotiation for all devices.

notsc [BUGS=IA-32] Disable Time Stamp Counter
Expand Down
12 changes: 11 additions & 1 deletion init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,15 @@ static void __init do_basic_setup(void)
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)
{
extern int spawn_ksoftirqd(void);
Expand All @@ -737,7 +746,8 @@ static void __init do_pre_smp_initcalls(void)
migration_init();
#endif
spawn_ksoftirqd();
spawn_softlockup_task();
if (!nosoftlockup)
spawn_softlockup_task();
}

static void run_init_process(char *init_filename)
Expand Down

0 comments on commit 9784221

Please sign in to comment.