diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:17:14 -0400 | 
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 09:17:14 -0400 | 
| commit | 620f2efcdc5c7a2db68da41bc3df3cf9a718024e (patch) | |
| tree | b1a0411e2588953777d0b10245b12044c33cef54 /arch/m32r/kernel/irq.c | |
| parent | 04944b793e18ece23f63c0252646b310c1845940 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/xsave
Diffstat (limited to 'arch/m32r/kernel/irq.c')
| -rw-r--r-- | arch/m32r/kernel/irq.c | 6 | 
1 files changed, 0 insertions, 6 deletions
| diff --git a/arch/m32r/kernel/irq.c b/arch/m32r/kernel/irq.c index d0c5b0b7da2f..2aeae4670098 100644 --- a/arch/m32r/kernel/irq.c +++ b/arch/m32r/kernel/irq.c | |||
| @@ -22,9 +22,6 @@ | |||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> | 
| 23 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> | 
| 24 | 24 | ||
| 25 | atomic_t irq_err_count; | ||
| 26 | atomic_t irq_mis_count; | ||
| 27 | |||
| 28 | /* | 25 | /* | 
| 29 | * Generic, controller-independent functions: | 26 | * Generic, controller-independent functions: | 
| 30 | */ | 27 | */ | 
| @@ -63,9 +60,6 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 63 | seq_putc(p, '\n'); | 60 | seq_putc(p, '\n'); | 
| 64 | skip: | 61 | skip: | 
| 65 | spin_unlock_irqrestore(&irq_desc[i].lock, flags); | 62 | spin_unlock_irqrestore(&irq_desc[i].lock, flags); | 
| 66 | } else if (i == NR_IRQS) { | ||
| 67 | seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count)); | ||
| 68 | seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count)); | ||
| 69 | } | 63 | } | 
| 70 | return 0; | 64 | return 0; | 
| 71 | } | 65 | } | 
