[Xen-changelog] [xen master] unmodified-drivers: tolerate IRQF_DISABLED being undefined

[patchbot@xxxxxxx]

commit fed56ba0e69b251d0222ef0785cd1c1838f9e51d
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Tue Jun 2 13:45:03 2015 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Tue Jun 2 13:45:03 2015 +0200

    unmodified-drivers: tolerate IRQF_DISABLED being undefined
    
    It's being removed in Linux 4.1.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 unmodified_drivers/linux-2.6/platform-pci/evtchn.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c 
b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
index 35a2819..b72e37a 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);
 }
--
generated by git-patchbot for /home/xen/git/xen.git#master

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