Commit 1926d0ae authored Sep 01, 2013 by Ben Hutchings Committed by Greg Kroah-Hartman Sep 26, 2013

hvc_vio: Do not override preferred console set by kernel parameter

The original version of this was done by Bastian Blank, who wrote:

> The problem is the following:
> - Architecture specific code sets preferred console to something bogus.
> - Command line handling tries to set preferred console but is overruled
>   by the old setting.
>
> The udbg0 console is a boot console and independant.

References: http://bugs.debian.org/492703


Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 216fce2e

drivers/tty/hvc/hvc_vio.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@
		#include <asm/prom.h>
		#include <asm/hvsi.h>
		#include <asm/udbg.h>
		#include <asm/machdep.h>

		#include "hvc_console.h"

		@@ -457,6 +458,8 @@ void __init hvc_vio_init_early(void)
		if (hvterm_priv0.proto == HV_PROTOCOL_HVSI)
		goto out;
		#endif
		/* Check whether the user has requested a different console. */
		if (!strstr(cmd_line, "console="))
		add_preferred_console("hvc", 0, NULL);
		hvc_instantiate(0, 0, ops);
		out:

Admin message