From: Petr Mladek <pmladek@suse.com>
Date: Mon, 1 Jun 2020 08:15:16 +0000 (+0200)
Subject: Merge branch 'for-5.8' into for-linus
X-Git-Tag: v5.8-rc1~232^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d053cf0d771f6547cb0537759a9af63cf402908d;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'for-5.8' into for-linus
---

d053cf0d771f6547cb0537759a9af63cf402908d
diff --cc kernel/printk/printk.c
index c59d9a1567ad,a3990505abdf..2bafd5ce4057
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@@ -2708,16 -2685,17 +2746,15 @@@ static int try_enable_new_console(struc
   */
  void register_console(struct console *newcon)
  {
 -	int i;
  	unsigned long flags;
  	struct console *bcon = NULL;
 -	struct console_cmdline *c;
 -	static bool has_preferred;
 +	int err;
  
- 	if (console_drivers)
- 		for_each_console(bcon)
- 			if (WARN(bcon == newcon,
- 					"console '%s%d' already registered\n",
- 					bcon->name, bcon->index))
- 				return;
+ 	for_each_console(bcon) {
+ 		if (WARN(bcon == newcon, "console '%s%d' already registered\n",
+ 					 bcon->name, bcon->index))
+ 			return;
+ 	}
  
  	/*
  	 * before we register a new CON_BOOT console, make sure we don't