Merge with Linux 2.4.0-test6-pre4.

3 files changed, 40 insertions, 15 deletions

diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h
index 698a6f262..a35094450 100644
--- a/include/linux/agp_backend.h
+++ b/include/linux/agp_backend.h
@@ -50,6 +50,7 @@ enum chipset_type {
 	VIA_VP3,
 	VIA_MVP3,
 	VIA_MVP4,
+	VIA_APOLLO_SUPER,
 	VIA_APOLLO_PRO,
 	SIS_GENERIC,
 	AMD_GENERIC,
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
index 8eb171810..9d214fadc 100644
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@ -61,20 +61,9 @@ enum
 	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 @@ extern void open_softirq(int nr, void (*action)(struct softirq_action*), void *d
 
 static inline void __cpu_raise_softirq(int cpu, int nr)
 {
-	softirq_state[cpu].active |= (1<<nr);
+	softirq_active(cpu) |= (1<<nr);
 }
 
 
diff --git a/include/linux/irq_cpustat.h b/include/linux/irq_cpustat.h
new file mode 100644
index 000000000..98cf96ff4
--- /dev/null
+++ b/include/linux/irq_cpustat.h
@@ -0,0 +1,35 @@
+#ifndef __irq_cpustat_h
+#define __irq_cpustat_h
+
+/*
+ * Contains default mappings for irq_cpustat_t, used by almost every
+ * architecture.  Some arch (like s390) have per cpu hardware pages and
+ * they define their own mappings for irq_stat.
+ *
+ * Keith Owens <kaos@ocs.com.au> July 2000.
+ */
+
+/*
+ * Simple wrappers reducing source bloat.  Define all irq_stat fields
+ * here, even ones that are arch dependent.  That way we get common
+ * definitions instead of differing sets for each arch.
+ */
+
+extern irq_cpustat_t irq_stat[];			/* defined in asm/hardirq.h */
+
+#ifdef CONFIG_SMP
+#define __IRQ_STAT(cpu, member)	(irq_stat[cpu].member)
+#else
+#define __IRQ_STAT(cpu, member)	((void)(cpu), irq_stat[0].member)
+#endif	
+
+  /* arch independent irq_stat fields */
+#define softirq_active(cpu)	__IRQ_STAT((cpu), __softirq_active)
+#define softirq_mask(cpu)	__IRQ_STAT((cpu), __softirq_mask)
+#define local_irq_count(cpu)	__IRQ_STAT((cpu), __local_irq_count)
+#define local_bh_count(cpu)	__IRQ_STAT((cpu), __local_bh_count)
+#define syscall_count(cpu)	__IRQ_STAT((cpu), __syscall_count)
+  /* arch dependent irq_stat fields */
+#define nmi_count(cpu)		__IRQ_STAT((cpu), __nmi_count)		/* i386, ia64 */
+
+#endif	/* __irq_cpustat_h */