From patchwork Wed May 26 06:51:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 53590 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44B91B7D4C for ; Wed, 26 May 2010 16:51:46 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752766Ab0EZGvo (ORCPT ); Wed, 26 May 2010 02:51:44 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:39350 "EHLO sunset.davemloft.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752574Ab0EZGvn (ORCPT ); Wed, 26 May 2010 02:51:43 -0400 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 390B324C08E; Tue, 25 May 2010 23:51:54 -0700 (PDT) Date: Tue, 25 May 2010 23:51:54 -0700 (PDT) Message-Id: <20100525.235154.189709335.davem@davemloft.net> To: elendil@planet.nl Cc: sparclinux@vger.kernel.org Subject: Re: Serial console issue with 2.6.32 From: David Miller In-Reply-To: <201003171150.08245.elendil@planet.nl> References: <201003151809.27436.elendil@planet.nl> <20100317.000557.15934001.davem@davemloft.net> <201003171150.08245.elendil@planet.nl> X-Mailer: Mew version 6.3 on Emacs 23.1 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From: Frans Pop Date: Wed, 17 Mar 2010 11:50:07 +0100 > Now that I know it's not a huge issue for me personally. It just means I > can no longer use my Sparc box for testing use of console= for Debian > installations, which is a pity as it's the most suitable box I have for > that. > > I'm not sure how much this is going to throw off other users, but I suspect > the majority (except maybe for long time sparc sysadmins) would expect > console= to be honored. Frans, is this patch enough to get the behavior you want? -------------------- sunserial: Don't call add_preferred_console() when console= is specified. Reported-by: Frans Pop Signed-off-by: David S. Miller --- drivers/serial/suncore.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/serial/suncore.c b/drivers/serial/suncore.c index ed7d958..544f2e2 100644 --- a/drivers/serial/suncore.c +++ b/drivers/serial/suncore.c @@ -71,7 +71,9 @@ int sunserial_console_match(struct console *con, struct device_node *dp, con->index = line; drv->cons = con; - add_preferred_console(con->name, line, NULL); + + if (!console_set_on_cmdline) + add_preferred_console(con->name, line, NULL); return 1; }