Skip to content

Commit 07a2766

Browse files
JiexunWangpalmer-dabbelt
authored andcommitted
RISC-V: Fix wrong use of CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK
If configuration options SOFTIRQ_ON_OWN_STACK and PREEMPT_RT 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 'do_softirq_own_stack' was here 8 | static inline void do_softirq_own_stack(void) | ^~~~~~~~~~~~~~~~~~~~ After changing CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK to CONFIG_SOFTIRQ_ON_OWN_STACK, compilation can be successful. Fixes: dd69d07 ("riscv: stack: Support HAVE_SOFTIRQ_ON_OWN_STACK") Reviewed-by: Guo Ren <[email protected]> Signed-off-by: Jiexun Wang <[email protected]> Reviewed-by: Samuel Holland <[email protected]> Link: https://lore.kernel.org/r/[email protected] Cc: [email protected] Signed-off-by: Palmer Dabbelt <[email protected]>
1 parent 1d6cd21 commit 07a2766

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/riscv/kernel/irq.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ static void init_irq_stacks(void)
6060
}
6161
#endif /* CONFIG_VMAP_STACK */
6262

63-
#ifdef CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK
63+
#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK
6464
void do_softirq_own_stack(void)
6565
{
6666
#ifdef CONFIG_IRQ_STACKS
@@ -92,7 +92,7 @@ void do_softirq_own_stack(void)
9292
#endif
9393
__do_softirq();
9494
}
95-
#endif /* CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK */
95+
#endif /* CONFIG_SOFTIRQ_ON_OWN_STACK */
9696

9797
#else
9898
static void init_irq_stacks(void) {}

0 commit comments

Comments
 (0)