Merge tag 'v4.9.290' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y

This is the 4.9.290 stable release

Change-Id: Ib4889d4db19821476912824b74d2fea68a9cfe96
This commit is contained in:
Mauro (mdrjr) Ribeiro
2022-04-27 14:58:11 -03:00
27 changed files with 248 additions and 95 deletions

View File

@@ -2068,8 +2068,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;