patch-2.4.0-test5 linux/include/asm-ppc/hardirq.h

Next file: linux/include/asm-ppc/machdep.h
Previous file: linux/include/asm-mips/hardirq.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test4/linux/include/asm-ppc/hardirq.h linux/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 @@
  */
 #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

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)