From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753535AbbCAQJv (ORCPT ); Sun, 1 Mar 2015 11:09:51 -0500 Received: from mail-qg0-f47.google.com ([209.85.192.47]:65248 "EHLO mail-qg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751967AbbCAQGd (ORCPT ); Sun, 1 Mar 2015 11:06:33 -0500 From: Peter Hurley To: Greg Kroah-Hartman , Andrew Morton Cc: Jiri Slaby , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, Rob Herring , Peter Hurley Subject: [PATCH v2 -next 02/13] console: Preserve index after console setup() Date: Sun, 1 Mar 2015 11:05:47 -0500 Message-Id: <1425225958-17908-3-git-send-email-peter@hurleysoftware.com> X-Mailer: git-send-email 2.3.0 In-Reply-To: <1425225958-17908-1-git-send-email-peter@hurleysoftware.com> References: <1425225958-17908-1-git-send-email-peter@hurleysoftware.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 36a8661..098c2e0 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2480,7 +2480,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