Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 249f6d9e authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: move ack_bad_irq() to irq.c 



Share more duplicated code.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 6b39ba77

arch/x86/kernel/irq.c

+23 −0
Original line number Diff line number Diff line
@@ -12,6 +12,29 @@ 


atomic_t irq_err_count;



/*

 * 'what should we do if we get a hw irq event on an illegal vector'.

 * each architecture has to answer this themselves.

 */

void ack_bad_irq(unsigned int irq)

{

	printk(KERN_ERR "unexpected IRQ trap at vector %02x\n", irq);



#ifdef CONFIG_X86_LOCAL_APIC

	/*

	 * Currently unexpected vectors happen only on SMP and APIC.

	 * We _must_ ack these because every local APIC has only N

	 * irq slots per priority level, and a 'hanging, unacked' IRQ

	 * holds up an irq slot - in excessive cases (when multiple

	 * unexpected vectors occur) that might lock up the APIC

	 * completely.

	 * But only ack when the APIC is enabled -AK

	 */

	if (cpu_has_apic)

		ack_APIC_irq();

#endif

}



#ifdef CONFIG_X86_32

# define irq_stats(x)		(&per_cpu(irq_stat,x))

#else

arch/x86/kernel/irq_32.c

+0 −23
Original line number Diff line number Diff line
@@ -25,29 +25,6 @@ EXPORT_PER_CPU_SYMBOL(irq_stat); 
DEFINE_PER_CPU(struct pt_regs *, irq_regs);

EXPORT_PER_CPU_SYMBOL(irq_regs);



/*

 * 'what should we do if we get a hw irq event on an illegal vector'.

 * each architecture has to answer this themselves.

 */

void ack_bad_irq(unsigned int irq)

{

	printk(KERN_ERR "unexpected IRQ trap at vector %02x\n", irq);



#ifdef CONFIG_X86_LOCAL_APIC

	/*

	 * Currently unexpected vectors happen only on SMP and APIC.

	 * We _must_ ack these because every local APIC has only N

	 * irq slots per priority level, and a 'hanging, unacked' IRQ

	 * holds up an irq slot - in excessive cases (when multiple

	 * unexpected vectors occur) that might lock up the APIC

	 * completely.

	 * But only ack when the APIC is enabled -AK

	 */

	if (cpu_has_apic)

		ack_APIC_irq();

#endif

}



#ifdef CONFIG_DEBUG_STACKOVERFLOW

/* Debugging check for stack overflow: is there less than 1KB free? */

static int check_stack_overflow(void)

arch/x86/kernel/irq_64.c

+0 −20
Original line number Diff line number Diff line
@@ -18,26 +18,6 @@ 
#include <asm/idle.h>

#include <asm/smp.h>



/*

 * 'what should we do if we get a hw irq event on an illegal vector'.

 * each architecture has to answer this themselves.

 */

void ack_bad_irq(unsigned int irq)

{

	printk(KERN_WARNING "unexpected IRQ trap at vector %02x\n", irq);

	/*

	 * Currently unexpected vectors happen only on SMP and APIC.

	 * We _must_ ack these because every local APIC has only N

	 * irq slots per priority level, and a 'hanging, unacked' IRQ

	 * holds up an irq slot - in excessive cases (when multiple

	 * unexpected vectors occur) that might lock up the APIC

	 * completely.

	 * But don't ack when the APIC is disabled. -AK

	 */

	if (!disable_apic)

		ack_APIC_irq();

}



#ifdef CONFIG_DEBUG_STACKOVERFLOW

/*

 * Probabilistic stack overflow check: