diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:42:53 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-10 20:42:53 -0500 |
commit | 506c10f26c481b7f8ef27c1c79290f68989b2e9e (patch) | |
tree | 03de82e812f00957aa6276dac2fe51c3358e88d7 /arch/x86/kernel/irq.c | |
parent | e1df957670aef74ffd9a4ad93e6d2c90bf6b4845 (diff) | |
parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) |
Merge commit 'v2.6.29-rc1' into perfcounters/core
Conflicts:
include/linux/kernel_stat.h
Diffstat (limited to 'arch/x86/kernel/irq.c')
-rw-r--r-- | arch/x86/kernel/irq.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index d92bc71e41a7..22f650db917f 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c | |||
@@ -5,10 +5,11 @@ | |||
5 | #include <linux/interrupt.h> | 5 | #include <linux/interrupt.h> |
6 | #include <linux/kernel_stat.h> | 6 | #include <linux/kernel_stat.h> |
7 | #include <linux/seq_file.h> | 7 | #include <linux/seq_file.h> |
8 | #include <linux/smp.h> | ||
8 | 9 | ||
9 | #include <asm/apic.h> | 10 | #include <asm/apic.h> |
10 | #include <asm/io_apic.h> | 11 | #include <asm/io_apic.h> |
11 | #include <asm/smp.h> | 12 | #include <asm/irq.h> |
12 | 13 | ||
13 | atomic_t irq_err_count; | 14 | atomic_t irq_err_count; |
14 | 15 | ||
@@ -122,6 +123,9 @@ int show_interrupts(struct seq_file *p, void *v) | |||
122 | } | 123 | } |
123 | 124 | ||
124 | desc = irq_to_desc(i); | 125 | desc = irq_to_desc(i); |
126 | if (!desc) | ||
127 | return 0; | ||
128 | |||
125 | spin_lock_irqsave(&desc->lock, flags); | 129 | spin_lock_irqsave(&desc->lock, flags); |
126 | #ifndef CONFIG_SMP | 130 | #ifndef CONFIG_SMP |
127 | any_count = kstat_irqs(i); | 131 | any_count = kstat_irqs(i); |
@@ -192,3 +196,5 @@ u64 arch_irq_stat(void) | |||
192 | #endif | 196 | #endif |
193 | return sum; | 197 | return sum; |
194 | } | 198 | } |
199 | |||
200 | EXPORT_SYMBOL_GPL(vector_used_by_percpu_irq); | ||