diff options
author | David Vrabel <david.vrabel@citrix.com> | 2013-10-01 19:00:49 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-13 16:08:33 -0700 |
commit | 8598a32d43af4abe6f3a464af8be7fc020080cf3 (patch) | |
tree | b50935ff40b2a844aceb0495a2c899d8ec1e0d6f /drivers/tty/hvc | |
parent | 1b069646f53350d9c1188cef6d6bdd09a1df8b44 (diff) | |
download | linux-3.10-8598a32d43af4abe6f3a464af8be7fc020080cf3.tar.gz linux-3.10-8598a32d43af4abe6f3a464af8be7fc020080cf3.tar.bz2 linux-3.10-8598a32d43af4abe6f3a464af8be7fc020080cf3.zip |
xen/hvc: allow xenboot console to be used again
commit a9fbf4d591da6cd1d3eaab826c7c15f77fc8f6a3 upstream.
Commit d0380e6c3c0f6edb986d8798a23acfaf33d5df23 (early_printk:
consolidate random copies of identical code) added in 3.10 introduced
a check for con->index == -1 in early_console_register().
Initialize index to -1 for the xenboot console so earlyprintk=xen
works again.
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/hvc')
-rw-r--r-- | drivers/tty/hvc/hvc_xen.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c index 682210d778b..4fc32c8091e 100644 --- a/drivers/tty/hvc/hvc_xen.c +++ b/drivers/tty/hvc/hvc_xen.c @@ -636,6 +636,7 @@ struct console xenboot_console = { .name = "xenboot", .write = xenboot_write_console, .flags = CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME, + .index = -1, }; #endif /* CONFIG_EARLY_PRINTK */ |