From nobody Thu Jun 18 17:04:19 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ED330C433EF for ; Mon, 18 Apr 2022 15:51:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345870AbiDRPxm (ORCPT ); Mon, 18 Apr 2022 11:53:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44234 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345774AbiDRPx0 (ORCPT ); Mon, 18 Apr 2022 11:53:26 -0400 Received: from m12-16.163.com (m12-16.163.com [220.181.12.16]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5FDA86170 for ; Mon, 18 Apr 2022 08:37:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=aP0d/ Hf8MbnjKRwf/U/o9tyKg4RaO+xBC7661/QXVMQ=; b=Fk0JcKcJRVeC6/PoUGOF3 PY5e2iVyhi9hchKblMKX0QtJyHVMjt/ZfnupXlJQXcAX6ru4/507hu2jJEt+4Kwu O8i5KEl1IWvvxeKFEK9IWeklwftVIvsId9+P4Ews4kO36USUsglgSo7MOfoZ/1q5 05UyrzVxtEIFOGHdY35T3Q= Received: from localhost (unknown [116.30.192.61]) by smtp12 (Coremail) with SMTP id EMCowACH_SmvhV1iUzhcAQ--.2679S2; Mon, 18 Apr 2022 23:37:20 +0800 (CST) From: Junwen Wu To: gregkh@linuxfoundation.org, jirislaby@kernel.org Cc: linux-kernel@vger.kernel.org, Junwen Wu Subject: [PATCH v2] tty/sysrq: change the definition of sysrq_key_table's element to make it more readable Date: Mon, 18 Apr 2022 15:37:03 +0000 Message-Id: <20220418153703.97705-1-wudaemon@163.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: EMCowACH_SmvhV1iUzhcAQ--.2679S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7AFyUury3Kr1xAF45Jr48Crg_yoW8Cryfpa yxuryqyFy5ZF40qw1xCF4jgF4ayr93Ga4a9r15Ca4S9wn8Kr18AFWjyaySgryrJrW8GF12 krW0vr15Xw1UJ37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jH6wZUUUUU= X-Originating-IP: [116.30.192.61] X-CM-SenderInfo: 5zxgtvxprqqiywtou0bp/xtbBFBDmbVaEDYMLDwAAsX Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Junwen Wu The definition of sysrq_key_table's elements, like sysrq_thaw_op and sysrq_showallcpus_op are not consistent with sysrq_ftrace_dump_op, Consistency makes code more readable. Signed-off-by: Junwen Wu Reviewed-by: Jiri Slaby --- V1 -> V2: Fix some commit message's error drivers/tty/sysrq.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/tty/sysrq.c b/drivers/tty/sysrq.c index bbfd004449b5..9485156bf48b 100644 --- a/drivers/tty/sysrq.c +++ b/drivers/tty/sysrq.c @@ -274,6 +274,8 @@ static const struct sysrq_key_op sysrq_showallcpus_op = =3D { .action_msg =3D "Show backtrace of all active CPUs", .enable_mask =3D SYSRQ_ENABLE_DUMP, }; +#else +#define sysrq_showallcpus_op (*(const struct sysrq_key_op *)NULL) #endif =20 static void sysrq_handle_showregs(int key) @@ -405,6 +407,7 @@ static const struct sysrq_key_op sysrq_moom_op =3D { .enable_mask =3D SYSRQ_ENABLE_SIGNAL, }; =20 +#ifdef CONFIG_BLOCK static void sysrq_handle_thaw(int key) { emergency_thaw_all(); @@ -415,6 +418,9 @@ static const struct sysrq_key_op sysrq_thaw_op =3D { .action_msg =3D "Emergency Thaw of all frozen filesystems", .enable_mask =3D SYSRQ_ENABLE_SIGNAL, }; +#else +#define sysrq_thaw_op (*(const struct sysrq_key_op *)NULL) +#endif =20 static void sysrq_handle_kill(int key) { @@ -468,17 +474,9 @@ static const struct sysrq_key_op *sysrq_key_table[62] = =3D { NULL, /* g */ NULL, /* h - reserved for help */ &sysrq_kill_op, /* i */ -#ifdef CONFIG_BLOCK &sysrq_thaw_op, /* j */ -#else - NULL, /* j */ -#endif &sysrq_SAK_op, /* k */ -#ifdef CONFIG_SMP &sysrq_showallcpus_op, /* l */ -#else - NULL, /* l */ -#endif &sysrq_showmem_op, /* m */ &sysrq_unrt_op, /* n */ /* o: This will often be registered as 'Off' at init time */ --=20 2.25.1