OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

printk: correct timeout comment, neaten MODULE_PARM_DESC 

Neaten the MODULE_PARAM_DESC message.
Use 30 seconds in the comment for the zap console locks timeout.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Joe Perches 2015-02-12 15:01:34 -08:00 committed by Linus Torvalds
parent 02f1f2170d
commit 205bd3d23e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel/printk/printk.c
View File

@ -935,8 +935,8 @@ static int __init ignore_loglevel_setup(char *str)
early_param("ignore_loglevel", ignore_loglevel_setup); early_param("ignore_loglevel", ignore_loglevel_setup);
module_param(ignore_loglevel, bool, S_IRUGO | S_IWUSR); module_param(ignore_loglevel, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(ignore_loglevel, "ignore loglevel setting, to" MODULE_PARM_DESC(ignore_loglevel,
"print all kernel messages to the console."); "ignore loglevel setting (prints all kernel messages to the console)");
#ifdef CONFIG_BOOT_PRINTK_DELAY #ifdef CONFIG_BOOT_PRINTK_DELAY
@ -1419,16 +1419,16 @@ static void call_console_drivers(int level, const char *text, size_t len)
} }
/* /*
* Zap console related locks when oopsing. Only zap at most once * Zap console related locks when oopsing.
* every 10 seconds, to leave time for slow consoles to print a * To leave time for slow consoles to print a full oops,
* full oops. * only zap at most once every 30 seconds.
*/ */
static void zap_locks(void) static void zap_locks(void)
{ {
static unsigned long oops_timestamp; static unsigned long oops_timestamp;
if (time_after_eq(jiffies, oops_timestamp) && if (time_after_eq(jiffies, oops_timestamp) &&
!time_after(jiffies, oops_timestamp + 30 * HZ)) !time_after(jiffies, oops_timestamp + 30 * HZ))
return; return;
oops_timestamp = jiffies; oops_timestamp = jiffies;