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>

diff --git a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c
index 8c2822d973e314b3a80b94c81ef7e8772d36fdc1..35a2819af45636d5cd2d05b0e9493a1de514d714 100644 (file)
--- 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);
 }