Commit dc0cf5a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk 

Pull printk fix from Petr Mladek:
 "This reverts a fix added into 4.12-rc1. It caused the kernel log to be
  printed on another console when two consoles of the same type were
  defined, e.g. console=ttyS0 console=ttyS1.

  This configuration was never supported by kernel itself, but it
  started to make sense with systemd. In other words, the commit broke
  userspace"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk:
  Revert "printk: fix double printing with earlycon"
parents d0aab7d4 dac8bbba

kernel/printk/printk.c

+10 −36
Original line number Diff line number Diff line
@@ -269,7 +269,6 @@ static struct console *exclusive_console; 
#define MAX_CMDLINECONSOLES 8



static struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES];

static int console_cmdline_cnt;



static int preferred_console = -1;

int console_set_on_cmdline;
@@ -1906,25 +1905,12 @@ static int __add_preferred_console(char *name, int idx, char *options, 
	 *	See if this tty is not yet registered, and

	 *	if we have a slot free.

	 */

	for (i = 0, c = console_cmdline; i < console_cmdline_cnt; i++, c++) {

	for (i = 0, c = console_cmdline;

	     i < MAX_CMDLINECONSOLES && c->name[0];

	     i++, c++) {

		if (strcmp(c->name, name) == 0 && c->index == idx) {

			if (brl_options)

				return 0;



			/*

			 * Maintain an invariant that will help to find if

			 * the matching console is preferred, see

			 * register_console():

			 *

			 * The last non-braille console is always

			 * the preferred one.

			 */

			if (i != console_cmdline_cnt - 1)

				swap(console_cmdline[i],

				     console_cmdline[console_cmdline_cnt - 1]);



			preferred_console = console_cmdline_cnt - 1;



			if (!brl_options)

				preferred_console = i;

			return 0;

		}

	}
@@ -1937,7 +1923,6 @@ static int __add_preferred_console(char *name, int idx, char *options, 
	braille_set_options(c, brl_options);



	c->index = idx;

	console_cmdline_cnt++;

	return 0;

}

/*
@@ -2477,23 +2462,12 @@ void register_console(struct console *newcon) 
	}



	/*

	 * See if this console matches one we selected on the command line.

	 *

	 * There may be several entries in the console_cmdline array matching

	 * with the same console, one with newcon->match(), another by

	 * name/index:

	 *

	 *	pl011,mmio,0x87e024000000,115200 -- added from SPCR

	 *	ttyAMA0 -- added from command line

	 *

	 * Traverse the console_cmdline array in reverse order to be

	 * sure that if this console is preferred then it will be the first

	 * matching entry.  We use the invariant that is maintained in

	 * __add_preferred_console().

	 *	See if this console matches one we selected on

	 *	the command line.

	 */

	for (i = console_cmdline_cnt - 1; i >= 0; i--) {

		c = console_cmdline + i;



	for (i = 0, c = console_cmdline;

	     i < MAX_CMDLINECONSOLES && c->name[0];

	     i++, c++) {

		if (!newcon->match ||

		    newcon->match(newcon, c->name, c->index, c->options) != 0) {

			/* default matching */

CRA Git | Maintained and supported by SUSTech CRA and CCSE