]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/xen.git/commitdiff
unmodified-drivers: tolerate IRQF_DISABLED being undefined
authorJan Beulich <jbeulich@suse.com>
Tue, 2 Jun 2015 11:45:03 +0000 (13:45 +0200)
committerJan Beulich <jbeulich@suse.com>
Tue, 2 Jun 2015 11:45:03 +0000 (13:45 +0200)
It's being removed in Linux 4.1.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
unmodified_drivers/linux-2.6/platform-pci/evtchn.c

index 35a2819af45636d5cd2d05b0e9493a1de514d714..b72e37a2dd66981e81cf9988fa086875195f59dd 100644 (file)
@@ -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);
 }