diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-09 13:23:29 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-09-09 13:23:29 +0200 |
| commit | f448dda895edcee1bd92a3ec6c4d9d210523b853 (patch) | |
| tree | 867d4788f3ea911b3830f3bd5b271d7da39efd88 /arch/s390 | |
| parent | Merge tag 'spi-fix-v6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | asm-generic: Conditionally enable do_softirq_own_stack() via Kconfig. (diff) | |
| download | linux-f448dda895edcee1bd92a3ec6c4d9d210523b853.tar.xz linux-f448dda895edcee1bd92a3ec6c4d9d210523b853.zip | |
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/s390')
| -rw-r--r-- | arch/s390/include/asm/softirq_stack.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/include/asm/softirq_stack.h b/arch/s390/include/asm/softirq_stack.h index af68d6c1d584..1ac5115d3115 100644 --- a/arch/s390/include/asm/softirq_stack.h +++ b/arch/s390/include/asm/softirq_stack.h @@ -5,7 +5,7 @@ #include <asm/lowcore.h> #include <asm/stacktrace.h> -#ifndef CONFIG_PREEMPT_RT +#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK static inline void do_softirq_own_stack(void) { call_on_stack(0, S390_lowcore.async_stack, void, __do_softirq); |