diff options
author | Joe Perches <joe@perches.com> | 2015-02-12 18:01:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-12 21:54:13 -0500 |
commit | 205bd3d23e938530cb89ff9e14afda389ac85dc3 (patch) | |
tree | 21d4b9b0c888a5717387ea1b03706fe8c2b9c839 /kernel | |
parent | 02f1f2170d2831b3233e91091c60a66622f29e82 (diff) |
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>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/printk/printk.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 02d6b6d28796..c06df7de0963 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c | |||
@@ -935,8 +935,8 @@ static int __init ignore_loglevel_setup(char *str) | |||
935 | 935 | ||
936 | early_param("ignore_loglevel", ignore_loglevel_setup); | 936 | early_param("ignore_loglevel", ignore_loglevel_setup); |
937 | module_param(ignore_loglevel, bool, S_IRUGO | S_IWUSR); | 937 | module_param(ignore_loglevel, bool, S_IRUGO | S_IWUSR); |
938 | MODULE_PARM_DESC(ignore_loglevel, "ignore loglevel setting, to" | 938 | MODULE_PARM_DESC(ignore_loglevel, |
939 | "print all kernel messages to the console."); | 939 | "ignore loglevel setting (prints all kernel messages to the console)"); |
940 | 940 | ||
941 | #ifdef CONFIG_BOOT_PRINTK_DELAY | 941 | #ifdef CONFIG_BOOT_PRINTK_DELAY |
942 | 942 | ||
@@ -1419,16 +1419,16 @@ static void call_console_drivers(int level, const char *text, size_t len) | |||
1419 | } | 1419 | } |
1420 | 1420 | ||
1421 | /* | 1421 | /* |
1422 | * Zap console related locks when oopsing. Only zap at most once | 1422 | * Zap console related locks when oopsing. |
1423 | * every 10 seconds, to leave time for slow consoles to print a | 1423 | * To leave time for slow consoles to print a full oops, |
1424 | * full oops. | 1424 | * only zap at most once every 30 seconds. |
1425 | */ | 1425 | */ |
1426 | static void zap_locks(void) | 1426 | static void zap_locks(void) |
1427 | { | 1427 | { |
1428 | static unsigned long oops_timestamp; | 1428 | static unsigned long oops_timestamp; |
1429 | 1429 | ||
1430 | if (time_after_eq(jiffies, oops_timestamp) && | 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 | return; | 1432 | return; |
1433 | 1433 | ||
1434 | oops_timestamp = jiffies; | 1434 | oops_timestamp = jiffies; |