Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753317AbbBXQhe (ORCPT ); Tue, 24 Feb 2015 11:37:34 -0500 Received: from mail-qg0-f43.google.com ([209.85.192.43]:40864 "EHLO mail-qg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752336AbbBXQh3 (ORCPT ); Tue, 24 Feb 2015 11:37:29 -0500 From: Peter Hurley To: Greg Kroah-Hartman , Andrew Morton Cc: Arnd Bergmann , Rob Herring , Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Hurley Subject: [PATCH -next 02/13] console: Preserve index after console setup() Date: Tue, 24 Feb 2015 11:36:59 -0500 Message-Id: <1424795830-31223-3-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.3.0 In-Reply-To: <1424795830-31223-1-git-send-email-peter@hurleysoftware.com> References: <1424795830-31223-1-git-send-email-peter@hurleysoftware.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1223 Lines: 33 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 --- kernel/printk/printk.c | 1 - 1 file changed, 1 deletion(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 02d6b6d..ce5c297 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; -- 2.3.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/