forked from Minki/linux
Merge branch 'for-5.15-verbose-console' into for-linus
This commit is contained in:
commit
baa99c9267
@ -4167,6 +4167,15 @@
|
||||
Format: <bool> (1/Y/y=enable, 0/N/n=disable)
|
||||
default: disabled
|
||||
|
||||
printk.console_no_auto_verbose=
|
||||
Disable console loglevel raise on oops, panic
|
||||
or lockdep-detected issues (only if lock debug is on).
|
||||
With an exception to setups with low baudrate on
|
||||
serial console, keeping this 0 is a good choice
|
||||
in order to provide more debug information.
|
||||
Format: <bool>
|
||||
default: 0 (auto_verbose is enabled)
|
||||
|
||||
printk.devkmsg={on,off,ratelimit}
|
||||
Control writing to /dev/kmsg.
|
||||
on - unlimited logging to /dev/kmsg from userspace
|
||||
|
@ -70,16 +70,7 @@ extern int console_printk[];
|
||||
#define minimum_console_loglevel (console_printk[2])
|
||||
#define default_console_loglevel (console_printk[3])
|
||||
|
||||
static inline void console_silent(void)
|
||||
{
|
||||
console_loglevel = CONSOLE_LOGLEVEL_SILENT;
|
||||
}
|
||||
|
||||
static inline void console_verbose(void)
|
||||
{
|
||||
if (console_loglevel)
|
||||
console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH;
|
||||
}
|
||||
extern void console_verbose(void);
|
||||
|
||||
/* strlen("ratelimit") + 1 */
|
||||
#define DEVKMSG_STR_MAX_SIZE 10
|
||||
|
@ -2380,6 +2380,18 @@ module_param_named(console_suspend, console_suspend_enabled,
|
||||
MODULE_PARM_DESC(console_suspend, "suspend console during suspend"
|
||||
" and hibernate operations");
|
||||
|
||||
static bool printk_console_no_auto_verbose;
|
||||
|
||||
void console_verbose(void)
|
||||
{
|
||||
if (console_loglevel && !printk_console_no_auto_verbose)
|
||||
console_loglevel = CONSOLE_LOGLEVEL_MOTORMOUTH;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(console_verbose);
|
||||
|
||||
module_param_named(console_no_auto_verbose, printk_console_no_auto_verbose, bool, 0644);
|
||||
MODULE_PARM_DESC(console_no_auto_verbose, "Disable console loglevel raise to highest on oops/panic/etc");
|
||||
|
||||
/**
|
||||
* suspend_console - suspend the console subsystem
|
||||
*
|
||||
|
Loading…
Reference in New Issue
Block a user