Received: by 10.223.185.116 with SMTP id b49csp1929979wrg; Mon, 12 Feb 2018 01:01:38 -0800 (PST) X-Google-Smtp-Source: AH8x225YJ3cY/1PVuY6C1PIY1vtcFWA+1heZPCXfIN3aHJAQunUuoCOS+fr7YQyBgTHnyCc5MT6X X-Received: by 10.99.117.83 with SMTP id f19mr7096170pgn.318.1518426098607; Mon, 12 Feb 2018 01:01:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518426098; cv=none; d=google.com; s=arc-20160816; b=TZxypY/U0CVEjAyTq0HpZ7cmU+NDZ+XLXYHoTQvymp2ew7i0eFkKe471IR4iFFSxEB A278Xm2tqpcsZYIdKMPlUF/6I+YAcCIkwsrarY8BidV7WA/pHrKiZPhqEYd9uY9CPjeD 0qA3em0F8GA60n/x6eKFXYU+5rXTLsgOBvb798s68umGYubQIb35M/rPRnJ1XP4Zj9eo y2kJSPJwAR4cTkXUouHsPb/BGgYFWEOU6/HiWumWRMc0vsAjGBbDzTcHg3266ecHMta5 KK0jHx1vHlxNtd695OyVXY8B4URvZIRKk1HfoCwkUGnYsIKIEYXLUo1vF25O27DXs4FR kR4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=b/bqUWg9rBhW943OPavp7S0K2FdG9c7UCotRKpdQf0c=; b=nN7RePkmBpWF1oEC9LcJ446CvsY1/nr18luwMqD3wMAMHi9438H5SjHXwZNnoMntDd BgGZILCazK7GjLSyGv8DAVLgYMZf/U2zO8d2HQAId6oIpewPrfs8BXr/85yfO54sHkB0 ejJYD6bp1VFf+UPxpXpUqsTbJQXyjSkYf+RjUUrancaM2t3/aAsVlJeizPdDxjFn14h/ ieA8MhlNQnTY1OJ4IJ8UVloXKquKKXNxJ5zSt0yeI6YOmRLkQKC5JLlM2CYC7PaEEnM1 NyuH8iAE1Gff3HGnRQj9v8+cYzaPpwsmVkgeUXs1p+ZTkt0xe/dUxvT9/bXxrXCMisOC znrA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bd1-v6si5536263plb.69.2018.02.12.01.01.24; Mon, 12 Feb 2018 01:01:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=ibm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933136AbeBLJAR (ORCPT + 99 others); Mon, 12 Feb 2018 04:00:17 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:56802 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932768AbeBLJAP (ORCPT ); Mon, 12 Feb 2018 04:00:15 -0500 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w1C8xUYM110324 for ; Mon, 12 Feb 2018 04:00:15 -0500 Received: from e06smtp11.uk.ibm.com (e06smtp11.uk.ibm.com [195.75.94.107]) by mx0a-001b2d01.pphosted.com with ESMTP id 2g338fgwm3-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 12 Feb 2018 04:00:15 -0500 Received: from localhost by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 12 Feb 2018 09:00:12 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (9.149.109.198) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 12 Feb 2018 09:00:09 -0000 Received: from d06av26.portsmouth.uk.ibm.com (d06av26.portsmouth.uk.ibm.com [9.149.105.62]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id w1C9089m49217762; Mon, 12 Feb 2018 09:00:08 GMT Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 74D96AE056; Mon, 12 Feb 2018 08:51:14 +0000 (GMT) Received: from d06av26.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C4544AE059; Mon, 12 Feb 2018 08:51:12 +0000 (GMT) Received: from vajain21.in.ibm.com (unknown [9.124.35.190]) by d06av26.portsmouth.uk.ibm.com (Postfix) with ESMTP; Mon, 12 Feb 2018 08:51:12 +0000 (GMT) From: Vaibhav Jain To: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Cc: Vaibhav Jain , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Balbir Singh , Nicholas Piggin , Douglas Miller , Pan Xinhui Subject: [PATCH] powerpc/xmon: Dont register sysrq key when kernel param xmon=off Date: Mon, 12 Feb 2018 14:29:56 +0530 X-Mailer: git-send-email 2.14.3 X-TM-AS-GCONF: 00 x-cbid: 18021209-0040-0000-0000-0000042ECFBF X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18021209-0041-0000-0000-000020D28DFE Message-Id: <20180212085956.12016-1-vaibhav@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2018-02-12_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1802120116 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Presently sysrq key for xmon('x') is registered during kernel init irrespective of the value of kernel param 'xmon'. Thus xmon is enabled even if 'xmon=off' is passed on the kernel command line. This minor patch updates setup_xmon_sysrq() to register 'sysrq_xmon_op' only when variable 'xmon_on' is set. Signed-off-by: Vaibhav Jain --- arch/powerpc/xmon/xmon.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 82e1a3ee6e0f..3b995474b102 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -3642,8 +3642,7 @@ static struct sysrq_key_op sysrq_xmon_op = { static int __init setup_xmon_sysrq(void) { - register_sysrq_key('x', &sysrq_xmon_op); - return 0; + return xmon_on ? register_sysrq_key('x', &sysrq_xmon_op) : 0; } device_initcall(setup_xmon_sysrq); #endif /* CONFIG_MAGIC_SYSRQ */ -- 2.14.3