From mboxrd@z Thu Jan  1 00:00:00 1970
From: Alex Williamson <alex.williamson@hp.com>
Subject: [PATCH] add architecture specific softirq headers
Date: Thu, 30 Nov 2006 09:54:00 -0700
Message-ID: <1164905640.6117.5.camel@lappy>
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="=-byIDSK8+Kxbg8S4FdGo7"
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Keir Fraser <Keir.Fraser@cl.cam.ac.uk>
Cc: xen-devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org


--=-byIDSK8+Kxbg8S4FdGo7
Content-Type: text/plain
Content-Transfer-Encoding: 7bit


   We have a need for a couple architecture specific softirqs for
handling collection of system firmware error records on ia64.  Rather
than add error prone architecture #ifdefs to xen/softirq.h, I propose
extending the generic header to include an architecture specific header
as in the attached patch.  Thoughts?  Thanks,

	Alex

Signed-off-by: Alex Williamson <alex.williamson@hp.com>
---


--=-byIDSK8+Kxbg8S4FdGo7
Content-Disposition: attachment; filename=arch-softirq.patch
Content-Type: text/x-patch; name=arch-softirq.patch; charset=UTF-8
Content-Transfer-Encoding: 7bit

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__ */

--=-byIDSK8+Kxbg8S4FdGo7
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel

--=-byIDSK8+Kxbg8S4FdGo7--