30 lines
865 B
Diff
30 lines
865 B
Diff
|
# Commit fed56ba0e69b251d0222ef0785cd1c1838f9e51d
|
||
|
|
# Date 2015-06-02 13:45:03 +0200
|
||
|
|
# Author Jan Beulich <jbeulich@suse.com>
|
||
|
|
# Committer Jan Beulich <jbeulich@suse.com>
|
||
|
|
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>
|
||
|
|
|
||
|
|
--- 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);
|
||
|
|
}
|