aboutsummaryrefslogtreecommitdiffstats
path: root/unmodified_drivers
diff options
context:
space:
mode:
authorOlaf Hering <olaf@aepfle.de>2012-09-10 10:54:13 +0200
committerOlaf Hering <olaf@aepfle.de>2012-09-10 10:54:13 +0200
commitaca51da7badfe63f0dc4848dc2a13d55c91f1b6f (patch)
treed743dbef5788958cc6acf8768668d2c130ccfffa /unmodified_drivers
parentd32a40244c1f7084a0fa1970001874b9474bfc31 (diff)
downloadxen-aca51da7badfe63f0dc4848dc2a13d55c91f1b6f.tar.gz
xen-aca51da7badfe63f0dc4848dc2a13d55c91f1b6f.tar.bz2
xen-aca51da7badfe63f0dc4848dc2a13d55c91f1b6f.zip
unmodified_drivers: handle IRQF_SAMPLE_RANDOM
The flag IRQF_SAMPLE_RANDOM was removed in 3.6-rc1. Add it only if it is defined. An additional call to add_interrupt_randomness is appearently not needed because its now called unconditionally in handle_irq_event_percpu(). Signed-off-by: Olaf Hering <olaf@aepfle.de> Committed-by: Jan Beulich <jbeulich@suse.com>
Diffstat (limited to 'unmodified_drivers')
-rw-r--r--unmodified_drivers/linux-2.6/platform-pci/evtchn.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
index 8c2822d973..35a2819af4 100644
--- a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
+++ b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
@@ -350,7 +350,11 @@ 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 | IRQF_SAMPLE_RANDOM | IRQF_DISABLED,
+ IRQF_SHARED |
+#ifdef IRQF_SAMPLE_RANDOM
+ IRQF_SAMPLE_RANDOM |
+#endif
+ IRQF_DISABLED,
#endif
"xen-platform-pci", pdev);
}