diff options
author | Andi Kleen <ak@suse.de> | 2006-09-26 04:52:29 -0400 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2006-09-26 04:52:29 -0400 |
commit | 7f11d8a5efd625ffa41cde1d8472f85e885478ec (patch) | |
tree | 4f80219fc2153166c89c54d6555498155fa2f3b2 /arch/x86_64/kernel/irq.c | |
parent | 5ba5891d44a6acade44887a0f3195489d46c12de (diff) |
[PATCH] Remove all ifdefs for local/io apic
IO-APIC or local APIC can only be disabled at runtime anyways and
Kconfig has forced these options on for a long time now.
The Kconfigs are kept only now for the benefit of the shared acpi
boot.c code.
Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel/irq.c')
-rw-r--r-- | arch/x86_64/kernel/irq.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86_64/kernel/irq.c b/arch/x86_64/kernel/irq.c index 5221a53e90c1..bfbcf92cfa4a 100644 --- a/arch/x86_64/kernel/irq.c +++ b/arch/x86_64/kernel/irq.c | |||
@@ -20,11 +20,9 @@ | |||
20 | #include <asm/idle.h> | 20 | #include <asm/idle.h> |
21 | 21 | ||
22 | atomic_t irq_err_count; | 22 | atomic_t irq_err_count; |
23 | #ifdef CONFIG_X86_IO_APIC | ||
24 | #ifdef APIC_MISMATCH_DEBUG | 23 | #ifdef APIC_MISMATCH_DEBUG |
25 | atomic_t irq_mis_count; | 24 | atomic_t irq_mis_count; |
26 | #endif | 25 | #endif |
27 | #endif | ||
28 | 26 | ||
29 | #ifdef CONFIG_DEBUG_STACKOVERFLOW | 27 | #ifdef CONFIG_DEBUG_STACKOVERFLOW |
30 | /* | 28 | /* |
@@ -92,18 +90,14 @@ skip: | |||
92 | for_each_online_cpu(j) | 90 | for_each_online_cpu(j) |
93 | seq_printf(p, "%10u ", cpu_pda(j)->__nmi_count); | 91 | seq_printf(p, "%10u ", cpu_pda(j)->__nmi_count); |
94 | seq_putc(p, '\n'); | 92 | seq_putc(p, '\n'); |
95 | #ifdef CONFIG_X86_LOCAL_APIC | ||
96 | seq_printf(p, "LOC: "); | 93 | seq_printf(p, "LOC: "); |
97 | for_each_online_cpu(j) | 94 | for_each_online_cpu(j) |
98 | seq_printf(p, "%10u ", cpu_pda(j)->apic_timer_irqs); | 95 | seq_printf(p, "%10u ", cpu_pda(j)->apic_timer_irqs); |
99 | seq_putc(p, '\n'); | 96 | seq_putc(p, '\n'); |
100 | #endif | ||
101 | seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count)); | 97 | seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count)); |
102 | #ifdef CONFIG_X86_IO_APIC | ||
103 | #ifdef APIC_MISMATCH_DEBUG | 98 | #ifdef APIC_MISMATCH_DEBUG |
104 | seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count)); | 99 | seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count)); |
105 | #endif | 100 | #endif |
106 | #endif | ||
107 | } | 101 | } |
108 | return 0; | 102 | return 0; |
109 | } | 103 | } |