diff options
Diffstat (limited to 'kernel/printk/printk.c')
| -rw-r--r-- | kernel/printk/printk.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 02d6b6d28796..01cfd69c54c6 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; |
| @@ -1811,7 +1811,7 @@ int vprintk_default(const char *fmt, va_list args) | |||
| 1811 | 1811 | ||
| 1812 | #ifdef CONFIG_KGDB_KDB | 1812 | #ifdef CONFIG_KGDB_KDB |
| 1813 | if (unlikely(kdb_trap_printk)) { | 1813 | if (unlikely(kdb_trap_printk)) { |
| 1814 | r = vkdb_printf(fmt, args); | 1814 | r = vkdb_printf(KDB_MSGSRC_PRINTK, fmt, args); |
| 1815 | return r; | 1815 | return r; |
| 1816 | } | 1816 | } |
| 1817 | #endif | 1817 | #endif |
