diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-20 09:21:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-11-20 09:21:11 -0800 |
| commit | 7d66d3ab139c8c195dbb603e21043b6e2d120fa3 (patch) | |
| tree | 9219d26411182bdb93bf743b66897d9f146c6bad /init | |
| parent | c3cda60e83c803a3b3b832f371c776e57194b2f0 (diff) | |
| parent | 34767e5357fc8051b192ff3fd921ade7c1b37c46 (diff) | |
Merge tag 'printk-for-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux
Pull printk updates from Petr Mladek:
- Print more precise information about the printk log buffer memory
usage.
- Make sure that the sysrq title is shown on the console even when
deferred.
- Do not enable earlycon by `console=` which is meant to disable the
default console.
* tag 'printk-for-6.13' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
printk: add dummy printk_force_console_enter/exit helpers
tty: sysrq: Use printk_force_console context on __handle_sysrq
printk: Introduce FORCE_CON flag
printk: Improve memory usage logging during boot
init: Don't proxy `console=` to earlycon
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/init/main.c b/init/main.c index c4778edae797..00fac1170294 100644 --- a/init/main.c +++ b/init/main.c @@ -754,10 +754,7 @@ static int __init do_early_param(char *param, char *val, const struct obs_kernel_param *p; for (p = __setup_start; p < __setup_end; p++) { - if ((p->early && parameq(param, p->str)) || - (strcmp(param, "console") == 0 && - strcmp(p->str, "earlycon") == 0) - ) { + if (p->early && parameq(param, p->str)) { if (p->setup_func(val) != 0) pr_warn("Malformed early option '%s'\n", param); } |