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 18:14:30 -0700 |
| commit | 38038ddd5b625af75f038501ae5e0f07ed892f95 (patch) | |
| tree | e5d76541f40edf7660110869ed0001e5a98f1722 | |
| parent | daf2f72265f68c1c1100d1bc6a4c4faed0344be2 (diff) | |
| download | kernel-common-38038ddd5b625af75f038501ae5e0f07ed892f95.tar.gz kernel-common-38038ddd5b625af75f038501ae5e0f07ed892f95.tar.bz2 kernel-common-38038ddd5b625af75f038501ae5e0f07ed892f95.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>
| -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 682210d778bd..4fc32c8091e9 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 */ |