diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-09 14:23:29 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-09 14:23:29 +0300 |
| commit | f448dda895edcee1bd92a3ec6c4d9d210523b853 (patch) | |
| tree | 867d4788f3ea911b3830f3bd5b271d7da39efd88 /arch/arm | |
| parent | 506357871c18e06565840d71c2ef9f818e19f460 (diff) | |
| parent | 8cbb2b50ee2dcb082675237eaaa48fe8479f8aa5 (diff) | |
| download | linux-f448dda895edcee1bd92a3ec6c4d9d210523b853.tar.xz | |
Merge tag 'asm-generic-fixes-6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull SOFTIRQ_ON_OWN_STACK rework from Arnd Bergmann:
"Just one fixup patch, reworking the softirq_on_own_stack logic for
preempt-rt kernels as discussed in
https://lore.kernel.org/all/CAHk-=wgZSD3W2y6yczad2Am=EfHYyiPzTn3CfXxrriJf9i5W5w@mail.gmail.com/"
* tag 'asm-generic-fixes-6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
asm-generic: Conditionally enable do_softirq_own_stack() via Kconfig.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index 034cb48c9eeb..fe28fc1f759d 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c @@ -70,7 +70,7 @@ static void __init init_irq_stacks(void) } } -#ifndef CONFIG_PREEMPT_RT +#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK static void ____do_softirq(void *arg) { __do_softirq(); |