diff -r d1b0a5adaeab xen/include/xen/softirq.h
--- a/xen/include/xen/softirq.h	Wed Nov 29 23:40:40 2006 +0000
+++ b/xen/include/xen/softirq.h	Thu Nov 30 09:43:39 2006 -0700
@@ -9,7 +9,17 @@
 #define NMI_SOFTIRQ                       4
 #define PAGE_SCRUB_SOFTIRQ                5
 #define TRACE_SOFTIRQ                     6
-#define NR_SOFTIRQS                       7
+
+#define NR_COMMON_SOFTIRQS                7
+
+#include <asm/softirq.h>
+
+#ifndef NR_ARCH_SOFTIRQS
+#warning No architecture defined NR_ARCH_SOFTIRQS, update asm/softirq.h
+#define NR_ARCH_SOFTIRQS                  0
+#endif
+
+#define NR_SOFTIRQS   (NR_COMMON_SOFTIRQS + NR_ARCH_SOFTIRQS)
 
 #ifndef __ASSEMBLY__
 
diff -r d1b0a5adaeab xen/include/asm-ia64/softirq.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xen/include/asm-ia64/softirq.h	Thu Nov 30 09:39:28 2006 -0700
@@ -0,0 +1,14 @@
+#ifndef __ASM_SOFTIRQ_H__
+#define __ASM_SOFTIRQ_H__
+
+/*
+ * This header only provides architecture specific softirqs.
+ * It should not be included except through xen/softirqs.h
+ */
+#if !defined(NR_COMMON_SOFTIRQS) || defined(NR_SOFTIRQS)
+#error asm/softirq.h should only be included from xen/softirq.h
+#endif
+
+#define NR_ARCH_SOFTIRQS    0
+
+#endif /* __ASM_SOFTIRQ_H__ */
diff -r d1b0a5adaeab xen/include/asm-powerpc/softirq.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xen/include/asm-powerpc/softirq.h	Thu Nov 30 09:35:54 2006 -0700
@@ -0,0 +1,14 @@
+#ifndef __ASM_SOFTIRQ_H__
+#define __ASM_SOFTIRQ_H__
+
+/*
+ * This header only provides architecture specific softirqs.
+ * It should not be included except through xen/softirqs.h
+ */
+#if !defined(NR_COMMON_SOFTIRQS) || defined(NR_SOFTIRQS)
+#error asm/softirq.h should only be included from xen/softirq.h
+#endif
+
+#define NR_ARCH_SOFTIRQS    0
+
+#endif /* __ASM_SOFTIRQ_H__ */
diff -r d1b0a5adaeab xen/include/asm-x86/softirq.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xen/include/asm-x86/softirq.h	Thu Nov 30 09:49:27 2006 -0700
@@ -0,0 +1,14 @@
+#ifndef __ASM_SOFTIRQ_H__
+#define __ASM_SOFTIRQ_H__
+
+/*
+ * This header only provides architecture specific softirqs.
+ * It should not be included except through xen/softirqs.h
+ */
+#if !defined(NR_COMMON_SOFTIRQS) || defined(NR_SOFTIRQS)
+#error asm/softirq.h should only be included from xen/softirq.h
+#endif
+
+#define NR_ARCH_SOFTIRQS    0
+
+#endif /* __ASM_SOFTIRQ_H__ */