[PATCH 092/100] xen/hvc: allow xenboot console to be used again

[David Vrabel]

On 11/10/13 11:42, Luis Henriques wrote:
> 3.5.7.23 -stable review patch.  If anyone has any objections, please let me know.

It's harmless to backport this, but it is only needed in 3.10 and later
(unless you've backported d0380e6c).

> From: David Vrabel <david.vrabel at citrix.com>
> 
> 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 at citrix.com>
> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> Cc: Jiri Slaby <jslaby at suse.cz>
> Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
> Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
> ---
>  drivers/tty/hvc/hvc_xen.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
> index 944eaeb..78873df 100644
> --- a/drivers/tty/hvc/hvc_xen.c
> +++ b/drivers/tty/hvc/hvc_xen.c
> @@ -634,6 +634,7 @@ struct console xenboot_console = {
>  	.name		= "xenboot",
>  	.write		= xenboot_write_console,
>  	.flags		= CON_PRINTBUFFER | CON_BOOT | CON_ANYTIME,
> +	.index		= -1,
>  };
>  #endif	/* CONFIG_EARLY_PRINTK */
>  

David