diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-26 10:38:21 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-09-26 10:38:21 +0200 |
commit | 67102bd31b4e31abb0abbc390381212a2d65db72 (patch) | |
tree | 904754c940eb87b951cf877f09074a7d28bc2947 /arch/x86/kernel/irq_32.c | |
parent | Revert "usb: storage: Add quirk for Samsung Fit flash" (diff) | |
parent | Linux 6.0-rc7 (diff) | |
download | linux-dev-67102bd31b4e31abb0abbc390381212a2d65db72.tar.xz linux-dev-67102bd31b4e31abb0abbc390381212a2d65db72.zip |
Merge 6.0-rc7 into usb-next
We need the USB fixes in here for other follow-on changes to be able to
be applied successfully.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/x86/kernel/irq_32.c')
-rw-r--r-- | arch/x86/kernel/irq_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c index e5dd6da78713..01833ebf5e8e 100644 --- a/arch/x86/kernel/irq_32.c +++ b/arch/x86/kernel/irq_32.c @@ -132,7 +132,7 @@ int irq_init_percpu_irqstack(unsigned int cpu) return 0; } -#ifndef CONFIG_PREEMPT_RT +#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK void do_softirq_own_stack(void) { struct irq_stack *irqstk; |