diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-04-09 04:52:26 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-10 08:35:57 -0400 |
commit | 778838600eb6973bdb6fd11e7f91b43cea4d6f45 (patch) | |
tree | 82bd6b1b97fc5e95a49c8a96b04639b50b29226b /arch/x86/kernel/irqinit_32.c | |
parent | 320fd99672a44ece6d1cd0d838ba31c8ebbf5979 (diff) |
x86: unify trivial differences in irqinit_{32,64}.c
Impact: cleanup
Reviewed-by Cyrill Gorcunov <gorcunov@openvz.org>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/irqinit_32.c')
-rw-r--r-- | arch/x86/kernel/irqinit_32.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c index a780de3ad5da..72ce94268d31 100644 --- a/arch/x86/kernel/irqinit_32.c +++ b/arch/x86/kernel/irqinit_32.c | |||
@@ -1,20 +1,24 @@ | |||
1 | #include <linux/linkage.h> | ||
1 | #include <linux/errno.h> | 2 | #include <linux/errno.h> |
2 | #include <linux/signal.h> | 3 | #include <linux/signal.h> |
3 | #include <linux/sched.h> | 4 | #include <linux/sched.h> |
4 | #include <linux/ioport.h> | 5 | #include <linux/ioport.h> |
5 | #include <linux/interrupt.h> | 6 | #include <linux/interrupt.h> |
7 | #include <linux/timex.h> | ||
6 | #include <linux/slab.h> | 8 | #include <linux/slab.h> |
7 | #include <linux/random.h> | 9 | #include <linux/random.h> |
8 | #include <linux/init.h> | 10 | #include <linux/init.h> |
9 | #include <linux/kernel_stat.h> | 11 | #include <linux/kernel_stat.h> |
10 | #include <linux/sysdev.h> | 12 | #include <linux/sysdev.h> |
11 | #include <linux/bitops.h> | 13 | #include <linux/bitops.h> |
14 | #include <linux/acpi.h> | ||
12 | #include <linux/io.h> | 15 | #include <linux/io.h> |
13 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
14 | 17 | ||
15 | #include <asm/atomic.h> | 18 | #include <asm/atomic.h> |
16 | #include <asm/system.h> | 19 | #include <asm/system.h> |
17 | #include <asm/timer.h> | 20 | #include <asm/timer.h> |
21 | #include <asm/hw_irq.h> | ||
18 | #include <asm/pgtable.h> | 22 | #include <asm/pgtable.h> |
19 | #include <asm/desc.h> | 23 | #include <asm/desc.h> |
20 | #include <asm/apic.h> | 24 | #include <asm/apic.h> |
@@ -22,6 +26,22 @@ | |||
22 | #include <asm/i8259.h> | 26 | #include <asm/i8259.h> |
23 | #include <asm/traps.h> | 27 | #include <asm/traps.h> |
24 | 28 | ||
29 | /* | ||
30 | * ISA PIC or low IO-APIC triggered (INTA-cycle or APIC) interrupts: | ||
31 | * (these are usually mapped to vectors 0x30-0x3f) | ||
32 | */ | ||
33 | |||
34 | /* | ||
35 | * The IO-APIC gives us many more interrupt sources. Most of these | ||
36 | * are unused but an SMP system is supposed to have enough memory ... | ||
37 | * sometimes (mostly wrt. hw bugs) we get corrupted vectors all | ||
38 | * across the spectrum, so we really want to be prepared to get all | ||
39 | * of these. Plus, more powerful systems might have more than 64 | ||
40 | * IO-APIC registers. | ||
41 | * | ||
42 | * (these are usually mapped into the 0x30-0xff vector range) | ||
43 | */ | ||
44 | |||
25 | #ifdef CONFIG_X86_32 | 45 | #ifdef CONFIG_X86_32 |
26 | /* | 46 | /* |
27 | * Note that on a 486, we don't want to do a SIGFPE on an irq13 | 47 | * Note that on a 486, we don't want to do a SIGFPE on an irq13 |