diff options
| author | Greg Kroah-Hartman <gregkh@google.com> | 2021-11-12 14:29:05 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2021-11-12 14:29:05 +0100 |
| commit | bf88ff8595925cd73a7c16b1a3b2d9aaf0467d5e (patch) | |
| tree | 954f2ded2fdc7b176755b60a0b6e5802114d4f35 /kernel | |
| parent | 8a5b8c8b0a4c26bb588e0e0c4034e1bef28ff82f (diff) | |
| parent | 18dc3b942ce31a243fb8ca212b42cccb2711f980 (diff) | |
Merge 4.4.292 into android-4.4-p
Changes in 4.4.292
scsi: core: Put LLD module refcnt after SCSI device is released
ARM: 9120/1: Revert "amba: make use of -1 IRQs warn"
net: hso: register netdev later to avoid a race condition
IB/qib: Use struct_size() helper
IB/qib: Protect from buffer overflow in struct qib_user_sdma_pkt fields
usb: gadget: Mark USB_FSL_QE broken on 64-bit
usb-storage: Add compatibility quirk flags for iODD 2531/2541
printk/console: Allow to disable console output by using console="" or console=null
usb: hso: fix error handling code of hso_create_net_device
isofs: Fix out of bound access for corrupted isofs image
comedi: dt9812: fix DMA buffers on stack
comedi: ni_usb6501: fix NULL-deref in command paths
staging: comedi: drivers: replace le16_to_cpu() with usb_endpoint_maxp()
comedi: vmk80xx: fix transfer-buffer overflows
comedi: vmk80xx: fix bulk-buffer overflow
comedi: vmk80xx: fix bulk and interrupt message timeouts
staging: r8712u: fix control-message timeout
staging: rtl8192u: fix control-message timeouts
rsi: fix control-message timeout
Linux 4.4.292
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: If914ee57e7bf4d5993bd24826726bb4908a2f978
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/printk/printk.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 4e83fb75d6d1..8e229b85f50e 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2040,8 +2040,15 @@ static int __init console_setup(char *str) char *s, *options, *brl_options = NULL; int idx; - if (str[0] == 0) + /* + * console="" or console=null have been suggested as a way to + * disable console output. Use ttynull that has been created + * for exacly this purpose. + */ + if (str[0] == 0 || strcmp(str, "null") == 0) { + __add_preferred_console("ttynull", 0, NULL, NULL); return 1; + } if (_braille_console_setup(&str, &brl_options)) return 1; |