From: Jan Beulich <jbeulich@suse.com>
Date: Tue, 2 Jun 2015 11:45:03 +0000 (+0200)
Subject: unmodified-drivers: tolerate IRQF_DISABLED being undefined
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3154
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fed56ba0e69b251d0222ef0785cd1c1838f9e51d;p=xen.git

unmodified-drivers: tolerate IRQF_DISABLED being undefined

It's being removed in Linux 4.1.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
index 35a2819af4..b72e37a2dd 100644
--- a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
+++ b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
@@ -350,11 +350,13 @@ int xen_irq_init(struct pci_dev *pdev)
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
 			   SA_SHIRQ | SA_SAMPLE_RANDOM | SA_INTERRUPT,
 #else
-			   IRQF_SHARED |
 #ifdef IRQF_SAMPLE_RANDOM
 			   IRQF_SAMPLE_RANDOM |
 #endif
-			   IRQF_DISABLED,
+#ifdef IRQF_DISABLED
+			   IRQF_DISABLED |
+#endif
+			   IRQF_SHARED,
 #endif
 			   "xen-platform-pci", pdev);
 }