patch-2.4.0-test6 linux/include/linux/interrupt.h

• Lines: 33
• Date: Wed Aug 9 18:57:55 2000
• Orig file: v2.4.0-test5/linux/include/linux/interrupt.h
• Orig date: Fri Jun 23 21:55:11 2000

diff -u --recursive --new-file v2.4.0-test5/linux/include/linux/interrupt.h linux/include/linux/interrupt.h
@@ -61,20 +61,9 @@
 	TASKLET_SOFTIRQ
 };
 
-#if SMP_CACHE_BYTES <= 32
-/* It is trick to make assembly easier. */
-#define SOFTIRQ_STATE_PAD 32
-#else
-#define SOFTIRQ_STATE_PAD SMP_CACHE_BYTES
-#endif
-
-struct softirq_state
-{
-	__u32	active;
-	__u32	mask;
-} __attribute__ ((__aligned__(SOFTIRQ_STATE_PAD)));
-
-extern struct softirq_state softirq_state[NR_CPUS];
+/* softirq mask and active fields moved to irq_cpustat_t in
+ * asm/hardirq.h to get better cache usage.  KAO
+ */
 
 struct softirq_action
 {
@@ -87,7 +76,7 @@
 
 static inline void __cpu_raise_softirq(int cpu, int nr)
 {
-	softirq_state[cpu].active |= (1<<nr);
+	softirq_active(cpu) |= (1<<nr);
 }