diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-21 22:00:56 +0000 |
| commit | 168660f24dfc46c2702acbe4701a446f42a59578 (patch) | |
| tree | f431368afbf6b1b71809cf3fd904d800ea126f4d /arch/s390 | |
| parent | 6420f767924fa73b0ea267864d96820815f4ba5a (diff) | |
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/kernel/irq.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c index 23165e3ba..298aa2482 100644 --- a/arch/s390/kernel/irq.c +++ b/arch/s390/kernel/irq.c @@ -45,8 +45,6 @@ int s390_request_irq( unsigned int irq, const char *devname, void *dev_id); -atomic_t nmi_counter; - #if 0 /* * The following vectors are part of the Linux architecture, there @@ -105,7 +103,7 @@ int get_irq_list(char *buf) } /* endfor */ - p += sprintf(p, "NMI: %10u\n", atomic_read(&nmi_counter)); + p += sprintf(p, "NMI: %10u\n", nmi_counter); #ifdef CONFIG_SMP p += sprintf(p, "IPI: %10u\n", atomic_read(&ipi_count)); #endif |