Commit 77883860 authored by Pekka Enberg's avatar Pekka Enberg Committed by Ingo Molnar
Browse files

x86: unify trivial differences in irqinit_{32,64}.c 



Impact: cleanup

Reviewed-by Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 320fd996

arch/x86/kernel/irqinit_32.c

+20 −0
Original line number Diff line number Diff line 
#include <linux/linkage.h>

#include <linux/errno.h>

#include <linux/signal.h>

#include <linux/sched.h>

#include <linux/ioport.h>

#include <linux/interrupt.h>

#include <linux/timex.h>

#include <linux/slab.h>

#include <linux/random.h>

#include <linux/init.h>

#include <linux/kernel_stat.h>

#include <linux/sysdev.h>

#include <linux/bitops.h>

#include <linux/acpi.h>

#include <linux/io.h>

#include <linux/delay.h>



#include <asm/atomic.h>

#include <asm/system.h>

#include <asm/timer.h>

#include <asm/hw_irq.h>

#include <asm/pgtable.h>

#include <asm/desc.h>

#include <asm/apic.h>
@@ -22,6 +26,22 @@ 
#include <asm/i8259.h>

#include <asm/traps.h>



/*

 * ISA PIC or low IO-APIC triggered (INTA-cycle or APIC) interrupts:

 * (these are usually mapped to vectors 0x30-0x3f)

 */



/*

 * The IO-APIC gives us many more interrupt sources. Most of these

 * are unused but an SMP system is supposed to have enough memory ...

 * sometimes (mostly wrt. hw bugs) we get corrupted vectors all

 * across the spectrum, so we really want to be prepared to get all

 * of these. Plus, more powerful systems might have more than 64

 * IO-APIC registers.

 *

 * (these are usually mapped into the 0x30-0xff vector range)

 */



#ifdef CONFIG_X86_32

/*

 * Note that on a 486, we don't want to do a SIGFPE on an irq13

arch/x86/kernel/irqinit_64.c

+4 −0
Original line number Diff line number Diff line
@@ -17,11 +17,14 @@ 


#include <asm/atomic.h>

#include <asm/system.h>

#include <asm/timer.h>

#include <asm/hw_irq.h>

#include <asm/pgtable.h>

#include <asm/desc.h>

#include <asm/apic.h>

#include <asm/setup.h>

#include <asm/i8259.h>

#include <asm/traps.h>



/*

 * ISA PIC or low IO-APIC triggered (INTA-cycle or APIC) interrupts:
@@ -136,6 +139,7 @@ static void __init init_ISA_irqs(void) 
	}

}



/* Overridden in paravirt.c */

void init_IRQ(void) __attribute__((weak, alias("native_init_IRQ")));



static void __init smp_intr_init(void)