Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Joe Perches and committed by
Linus Torvalds
205bd3d2 02f1f217

+6 -6
+6 -6
kernel/printk/printk.c
··· 935 935 936 936 early_param("ignore_loglevel", ignore_loglevel_setup); 937 937 module_param(ignore_loglevel, bool, S_IRUGO | S_IWUSR); 938 - MODULE_PARM_DESC(ignore_loglevel, "ignore loglevel setting, to" 939 - "print all kernel messages to the console."); 938 + MODULE_PARM_DESC(ignore_loglevel, 939 + "ignore loglevel setting (prints all kernel messages to the console)"); 940 940 941 941 #ifdef CONFIG_BOOT_PRINTK_DELAY 942 942 ··· 1419 1419 } 1420 1420 1421 1421 /* 1422 - * Zap console related locks when oopsing. Only zap at most once 1423 - * every 10 seconds, to leave time for slow consoles to print a 1424 - * full oops. 1422 + * Zap console related locks when oopsing. 1423 + * To leave time for slow consoles to print a full oops, 1424 + * only zap at most once every 30 seconds. 1425 1425 */ 1426 1426 static void zap_locks(void) 1427 1427 { 1428 1428 static unsigned long oops_timestamp; 1429 1429 1430 1430 if (time_after_eq(jiffies, oops_timestamp) && 1431 - !time_after(jiffies, oops_timestamp + 30 * HZ)) 1431 + !time_after(jiffies, oops_timestamp + 30 * HZ)) 1432 1432 return; 1433 1433 1434 1434 oops_timestamp = jiffies;