From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758348Ab3JKKxM (ORCPT ); Fri, 11 Oct 2013 06:53:12 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:38140 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758241Ab3JKKxK (ORCPT ); Fri, 11 Oct 2013 06:53:10 -0400 X-IronPort-AV: E=Sophos;i="4.90,1079,1371081600"; d="scan'208";a="60017737" Message-ID: <5257D893.3040105@citrix.com> Date: Fri, 11 Oct 2013 11:53:07 +0100 From: David Vrabel User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.16) Gecko/20121215 Iceowl/1.0b1 Icedove/3.0.11 MIME-Version: 1.0 To: Luis Henriques CC: , , , Greg Kroah-Hartman , Jiri Slaby Subject: Re: [PATCH 092/100] xen/hvc: allow xenboot console to be used again References: <1381488130-30235-1-git-send-email-luis.henriques@canonical.com> <1381488130-30235-93-git-send-email-luis.henriques@canonical.com> In-Reply-To: <1381488130-30235-93-git-send-email-luis.henriques@canonical.com> Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.80.2.76] X-DLP: MIA1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > > 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 > Cc: Greg Kroah-Hartman > Cc: Jiri Slaby > Signed-off-by: Greg Kroah-Hartman > Signed-off-by: Luis Henriques > --- > 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