summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2015-03-01 11:05:47 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-07 03:55:08 +0100
commitf427c990e2d0fd30336b0c252aa7e38e4cffdea2 (patch)
tree06d687959478af10ea2e5344b11170dd15a80852 /kernel
parent73abaf87f01be6fa6da3c0aa9c138a1b6b281068 (diff)
downloadlinux-stable-f427c990e2d0fd30336b0c252aa7e38e4cffdea2.tar.gz
linux-stable-f427c990e2d0fd30336b0c252aa7e38e4cffdea2.tar.bz2
linux-stable-f427c990e2d0fd30336b0c252aa7e38e4cffdea2.zip
console: Preserve index after console setup()
Before register_console() calls the setup() method of the matched console, the registering console index is already equal to the index from the console command line; ie. newcon->index == c->index. This change is also required to support extensible console matching; (the command line index may have no relation to the console index assigned by the console-defined match() function). Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk/printk.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index 01cfd69c54c6..d261a7e5f51a 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2479,7 +2479,6 @@ void register_console(struct console *newcon)
newcon->setup(newcon, console_cmdline[i].options) != 0)
break;
newcon->flags |= CON_ENABLED;
- newcon->index = c->index;
if (i == selected_console) {
newcon->flags |= CON_CONSDEV;
preferred_console = selected_console;