From nobody Wed Feb 11 22:55:57 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 4DAF3EEB595 for ; Wed, 13 Sep 2023 05:30:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235677AbjIMFa2 (ORCPT ); Wed, 13 Sep 2023 01:30:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229485AbjIMFa1 (ORCPT ); Wed, 13 Sep 2023 01:30:27 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.155.65.254]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C409172E for ; Tue, 12 Sep 2023 22:30:22 -0700 (PDT) X-QQ-mid: bizesmtp89t1694582995tg1po50m Received: from wangjiexun-virtual-machine.loca ( [183.230.12.200]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 13 Sep 2023 13:29:53 +0800 (CST) X-QQ-SSF: 01200000000000102000000A0000000 X-QQ-FEAT: ILHsT53NKPjfD7b8Zb6jchmbIcw0qlMMQyN/QLoYTr77IR2msFhRMvJYrb4ot 9WPBXDgryN09kt/n3PrdGPV55+xlfk5oD+LMpFQJOHDXCjKJHvxq/wtLCTun5iMYkiRtMdH urMDa/pLTLzA81GK+Ja8MkTs22OlbcRN0eMJYDOo6iVSEI+3yj1T7CJFyfUOsrWYvkAn74k tWRU9rqSF+66wmn6pmwA6Y1sMx1klkuMRkgRAo+dQMSSZiR82uf/CLQwQcCOfhAOVFT1rAp q6+W5Os5CxkuM08q46YQqcrbWtHmAdMQt6fngc/h7EWAlLTbUlAcuX0oKsx+R3/pFaJthKc fAi71Qb3Qsmf8rsgtOMk3TpB9dDedBf4wjY5+aprjaiqUkjuHGwYmkM2720zQ== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 10456565237369855809 From: Jiexun Wang To: samuel@sholland.org Cc: conor@kernel.org, guoren@kernel.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, falcon@tinylab.org, jszhang@kernel.org, tglx@linutronix.de, Jiexun Wang Subject: [PATCH v3] RISC-V: Fix wrong use of CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK Date: Wed, 13 Sep 2023 13:29:40 +0800 Message-Id: <20230913052940.374686-1-wangjiexun@tinylab.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrgz:qybglogicsvrgz5a-0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" If configuration options SOFTIRQ_ON_OWN_STACK and PREEMPT_RT=20 are enabled simultaneously under RISC-V architecture, it will result in a compilation failure: arch/riscv/kernel/irq.c:64:6: error: redefinition of 'do_softirq_own_stack' 64 | void do_softirq_own_stack(void) | ^~~~~~~~~~~~~~~~~~~~ In file included from ./arch/riscv/include/generated/asm/softirq_stack.h:1, from arch/riscv/kernel/irq.c:15: ./include/asm-generic/softirq_stack.h:8:20: note: previous definition of 'd= o_softirq_own_stack' was here 8 | static inline void do_softirq_own_stack(void) | ^~~~~~~~~~~~~~~~~~~~ =20 After changing CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK to CONFIG_SOFTIRQ_ON_OWN_ST= ACK, compilation can be successful. Fixes: dd69d07a5a6c ("riscv: stack: Support HAVE_SOFTIRQ_ON_OWN_STACK") Reviewed-by: Guo Ren Signed-off-by: Jiexun Wang Reviewed-by: Samuel Holland --- Changes in v3: - changed to a more suitable subject line - fix the #endif comment at the bottom of the function Changes in v2: - changed to a more suitable subject line - add a Fixes tag --- arch/riscv/kernel/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/riscv/kernel/irq.c b/arch/riscv/kernel/irq.c index a8efa053c4a5..9cc0a7669271 100644 --- a/arch/riscv/kernel/irq.c +++ b/arch/riscv/kernel/irq.c @@ -60,7 +60,7 @@ static void init_irq_stacks(void) } #endif /* CONFIG_VMAP_STACK */ =20 -#ifdef CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK +#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK void do_softirq_own_stack(void) { #ifdef CONFIG_IRQ_STACKS @@ -92,7 +92,7 @@ void do_softirq_own_stack(void) #endif __do_softirq(); } -#endif /* CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK */ +#endif /* CONFIG_SOFTIRQ_ON_OWN_STACK */ =20 #else static void init_irq_stacks(void) {} --=20 2.34.1