From nobody Fri Dec 19 10:09:53 2025 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 EADAAEB8FB7 for ; Wed, 6 Sep 2023 12:34:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234939AbjIFMeJ (ORCPT ); Wed, 6 Sep 2023 08:34:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40218 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229470AbjIFMeJ (ORCPT ); Wed, 6 Sep 2023 08:34:09 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.155.65.254]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03F471717 for ; Wed, 6 Sep 2023 05:34:00 -0700 (PDT) X-QQ-mid: bizesmtp69t1694003607tudcir6g Received: from wangjiexun-virtual-machine.loca ( [120.225.34.249]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 06 Sep 2023 20:33:25 +0800 (CST) X-QQ-SSF: 01200000000000101000000A0000000 X-QQ-FEAT: rZJGTgY0+YN9fNMQKTSU9Qgqmi6m+PTsmzRVbNPtaV/A5xhJrUGcYwefmJlX2 11PftMTdzH2cqBPrK2tlbOMGpQPvsx8ROqEMCA/K2OPtv6nPQVRePJtHMTGpp3PJhhqFPGb mikZCnSfIQyPN6JjodtSzMSxYb71LKA68AgC47JS3pH+QggfbwA/kb5qXHsFsv3qKloNs2s lHsWWZbIrfD9dIvnlNY3g4tkJqXGvREKwMEdd9pq0AyX4lZ/M2iIPo55/InKgZyQouQDwCQ AJikqyw/4mNUxwHlmQWJv0RwcRymPazYlLgJ2rjxgwaOtqaK+HeVtR1IL5uxTti4kk64G7L oWIQ8BC8T3eFKHZxH5DVYT7eO6zYALNU8SbEBu1VkT3wY3sgcrHXFzVYBlPGA== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 16057446587632364950 From: Jiexun Wang To: conor@kernel.org Cc: 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 v2] RISC-V: Fix use of non existent CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK Date: Wed, 6 Sep 2023 20:32:16 +0800 Message-Id: <20230906123216.255932-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") Signed-off-by: Jiexun Wang Reviewed-by: Guo Ren --- Changes in v2: - changed to a more suitable subject line - add a Fixes tag --- arch/riscv/kernel/irq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/kernel/irq.c b/arch/riscv/kernel/irq.c index a8efa053c4a5..a86f272ae2c3 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 --=20 2.34.1