diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-09-23 17:06:08 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-09-23 17:06:08 +0300 |
| commit | 69604fe76e58c9d195e48b41d019b07fc27ce9d7 (patch) | |
| tree | c9d1e7cfe406a8f168c3aceaf989eea0275d3045 /arch/x86 | |
| parent | 50b2d49bafa16e6311ab2da82f5aafc5f9ada99b (diff) | |
| parent | 189e7d876e48d7c791fe1c9c01516f70f5621a9f (diff) | |
| download | linux-69604fe76e58c9d195e48b41d019b07fc27ce9d7.tar.xz | |
Merge tag 'kvm-s390-master-6.0-2' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
More pci fixes
Fix for a code analyser warning
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/irq_stack.h | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/irq_32.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/irq_stack.h b/arch/x86/include/asm/irq_stack.h index 63f818aedf77..147cb8fdda92 100644 --- a/arch/x86/include/asm/irq_stack.h +++ b/arch/x86/include/asm/irq_stack.h @@ -203,7 +203,7 @@ IRQ_CONSTRAINTS, regs, vector); \ } -#ifndef CONFIG_PREEMPT_RT +#ifdef CONFIG_SOFTIRQ_ON_OWN_STACK /* * Macro to invoke __do_softirq on the irq stack. This is only called from * task context when bottom halves are about to be reenabled and soft 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; |