diff options
Diffstat (limited to 'arch/x86/kernel/irq.c')
| -rw-r--r-- | arch/x86/kernel/irq.c | 10 | 
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index 4215653f8a8e..21efee32e2b1 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c @@ -243,11 +243,15 @@ __visible unsigned int __irq_entry do_IRQ(struct pt_regs *regs)  	RCU_LOCKDEP_WARN(!rcu_is_watching(), "IRQ failed to wake up RCU");  	desc = __this_cpu_read(vector_irq[vector]); - -	if (!handle_irq(desc, regs)) { +	if (likely(!IS_ERR_OR_NULL(desc))) { +		if (IS_ENABLED(CONFIG_X86_32)) +			handle_irq(desc, regs); +		else +			generic_handle_irq_desc(desc); +	} else {  		ack_APIC_irq(); -		if (desc != VECTOR_RETRIGGERED && desc != VECTOR_SHUTDOWN) { +		if (desc == VECTOR_UNUSED) {  			pr_emerg_ratelimited("%s: %d.%d No irq handler for vector\n",  					     __func__, smp_processor_id(),  					     vector);  |