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 /include/asm-ppc/hardirq.h | |
| parent | 6420f767924fa73b0ea267864d96820815f4ba5a (diff) | |
Merge with Linux 2.4.0-test5-pre3.
Diffstat (limited to 'include/asm-ppc/hardirq.h')
| -rw-r--r-- | include/asm-ppc/hardirq.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/asm-ppc/hardirq.h b/include/asm-ppc/hardirq.h index 239580395..cc7425e24 100644 --- a/include/asm-ppc/hardirq.h +++ b/include/asm-ppc/hardirq.h @@ -7,8 +7,7 @@ typedef struct { unsigned int __local_irq_count; unsigned int __local_bh_count; - atomic_t __nmi_counter; - unsigned int __pad[5]; + unsigned int __pad[6]; } ____cacheline_aligned irq_cpustat_t; extern irq_cpustat_t irq_stat [NR_CPUS]; @@ -18,7 +17,6 @@ extern irq_cpustat_t irq_stat [NR_CPUS]; */ #define local_irq_count(cpu) (irq_stat[(cpu)].__local_irq_count) #define local_bh_count(cpu) (irq_stat[(cpu)].__local_bh_count) -#define nmi_counter(cpu) (irq_stat[(cpu)].__nmi_counter) /* * Are we in an interrupt context? Either doing bottom half |