| Message ID | 1396006898-31624-1-git-send-email-daniel.thompson@linaro.org |
|---|---|
| State | Accepted |
| Commit | 22766ed8a235f3c9043678c7c594afe683b2372f |
| Headers | show
Return-Path: <patchwork-forward+bncBCAPDLF44QLBBFOA2WMQKGQECOBT5XQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f197.google.com (mail-ig0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 327FC20062 for <linaro@patches.linaro.org>; Fri, 28 Mar 2014 11:42:14 +0000 (UTC) Received: by mail-ig0-f197.google.com with SMTP id hl1sf1895071igb.0 for <linaro@patches.linaro.org>; Fri, 28 Mar 2014 04:42:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=bbZXvf01VnjMNFEIi7GbbQlZdUS18aADm0InOfmGjnY=; b=I73pedex0yodiniqFOdL4Md85kGhYabztXr39tj2bLlD25sB4IdqfUzTF7tdwJo2XJ qKWJuSQN+0POxkosoy0miBw5WKrxbxzRHkcgGuKdmHgwVjaAl8lJRjGayQ1uwrWLiWRi lf850rPEmKObdITE5vNKuJEF8mqCAxIjsV8i0t8J+8Cu0cUv9fYUtafPybh+0uUikO8+ 0cF91yyGM2TpilVO4Xf5u/pz+PAA5D8vNMICm9rRF3lWYRfzpSjvq34B5A6TNX29XNey nvAu91vKlGnsgd4aU9zmHreyuASWMjcYK03bBmHzgM7hAalfRH0AHfbmB+7yhpxHTxdT T5aA== X-Gm-Message-State: ALoCoQl6khpmcC54c31SAAU0kE4oQ/VfE4tKjzYwOX6WhxY5v6dYwYzmgMCu7AgGUR8nBZa3vi8u X-Received: by 10.182.28.36 with SMTP id y4mr2987557obg.46.1396006933491; Fri, 28 Mar 2014 04:42:13 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.22.167 with SMTP id 36ls1516475qgn.55.gmail; Fri, 28 Mar 2014 04:42:13 -0700 (PDT) X-Received: by 10.58.187.78 with SMTP id fq14mr6662572vec.9.1396006933405; Fri, 28 Mar 2014 04:42:13 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id d12si1096543vco.83.2014.03.28.04.42.13 for <patchwork-forward@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Mar 2014 04:42:13 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id lg15so5823131vcb.30 for <patchwork-forward@linaro.org>; Fri, 28 Mar 2014 04:42:13 -0700 (PDT) X-Received: by 10.58.188.52 with SMTP id fx20mr108774vec.28.1396006933335; Fri, 28 Mar 2014 04:42:13 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.12.8 with SMTP id v8csp1530vcv; Fri, 28 Mar 2014 04:42:12 -0700 (PDT) X-Received: by 10.180.21.225 with SMTP id y1mr12113917wie.24.1396006932520; Fri, 28 Mar 2014 04:42:12 -0700 (PDT) Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by mx.google.com with ESMTPS id ne11si1755423wic.77.2014.03.28.04.42.12 for <patches@linaro.org> (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 28 Mar 2014 04:42:12 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.171 is neither permitted nor denied by best guess record for domain of daniel.thompson@linaro.org) client-ip=209.85.212.171; Received: by mail-wi0-f171.google.com with SMTP id q5so637451wiv.16 for <patches@linaro.org>; Fri, 28 Mar 2014 04:42:12 -0700 (PDT) X-Received: by 10.181.9.65 with SMTP id dq1mr11761107wid.51.1396006927244; Fri, 28 Mar 2014 04:42:07 -0700 (PDT) Received: from sundance.lan (cpc4-aztw19-0-0-cust157.18-1.cable.virginm.net. [82.33.25.158]) by mx.google.com with ESMTPSA id h19sm6422346wiw.17.2014.03.28.04.42.05 for <multiple recipients> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Mar 2014 04:42:06 -0700 (PDT) From: Daniel Thompson <daniel.thompson@linaro.org> To: linux-serial@vger.kernel.org Cc: patches@linaro.org, linaro-kernel@lists.linaro.org, Daniel Thompson <daniel.thompson@linaro.org>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Jiri Slaby <jslaby@suse.cz>, linux-kernel@vger.kernel.org, Jiri Kosina <trivial@kernel.org> Subject: [PATCH] serial: mux: Align SUPPORT_SYSRQ behaviour with other drivers. Date: Fri, 28 Mar 2014 11:41:38 +0000 Message-Id: <1396006898-31624-1-git-send-email-daniel.thompson@linaro.org> X-Mailer: git-send-email 1.9.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.thompson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: <patchwork-forward.linaro.org> X-Google-Group-Id: 836684582541 List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Unsubscribe: <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe>, <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com> |
diff --git a/drivers/tty/serial/mux.c b/drivers/tty/serial/mux.c index 7fd6aaa..9b27d34 100644 --- a/drivers/tty/serial/mux.c +++ b/drivers/tty/serial/mux.c @@ -29,7 +29,7 @@ #include <asm/irq.h> #include <asm/parisc-device.h> -#ifdef CONFIG_MAGIC_SYSRQ +#if defined(CONFIG_SERIAL_MUX_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) #include <linux/sysrq.h> #define SUPPORT_SYSRQ #endif
The mux driver is anomalous among all the serial drivers that can define SUPPORT_SYSRQ because it can, with some configs, set SUPPORT_SYSRQ when SERIAL_CORE_CONSOLE is not set. Not only does this impose a pointless (but tiny) runtime overhead for such configs but, more significantly, it adds needless complexity when doing a code review to check for unexpected side effects of any changes to the serial core. This is (cross-)compile tested only because I do not have any PA-RISC hardware. Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org> --- drivers/tty/serial/mux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)