File xen-unstable.unmodified-drivers-tolerate-IRQF_DISABLED-being-unde.patch of Package xen
From fed56ba0e69b251d0222ef0785cd1c1838f9e51d Mon Sep 17 00:00:00 2001 From: Jan Beulich <jbeulich@suse.com> Date: Tue, 2 Jun 2015 13:45:03 +0200 Subject: 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> --- unmodified_drivers/linux-2.6/platform-pci/evtchn.c | 6 ++++-- 1 file 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); }
