From: djm@kirby.fc.hp.com <djm@kirby.fc.hp.com>
Date: Fri, 13 Jan 2006 20:31:00 +0000 (-0600)
Subject: Leave *_SOFTIRQ definitions to Xen common code
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16541^2~38^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4b79423778b91b3a8d30ae010e0dfc220864ce3e;p=xen.git

Leave *_SOFTIRQ definitions to Xen common code
Signed-off-by: Dan Magenheimer <dan.magenheimer@hp.com>
---

diff --git a/xen/include/asm-ia64/linux-xen/linux/interrupt.h b/xen/include/asm-ia64/linux-xen/linux/interrupt.h
index 1061b5e081..210cea512a 100644
--- a/xen/include/asm-ia64/linux-xen/linux/interrupt.h
+++ b/xen/include/asm-ia64/linux-xen/linux/interrupt.h
@@ -104,6 +104,7 @@ extern void local_bh_enable(void);
    al. should be converted to tasklets, not to softirqs.
  */
 
+#ifndef XEN
 enum
 {
 	HI_SOFTIRQ=0,
@@ -113,6 +114,7 @@ enum
 	SCSI_SOFTIRQ,
 	TASKLET_SOFTIRQ
 };
+#endif
 
 /* softirq mask and active fields moved to irq_cpustat_t in
  * asm/hardirq.h to get better cache usage.  KAO