From aca51da7badfe63f0dc4848dc2a13d55c91f1b6f Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 10 Sep 2012 10:54:13 +0200 Subject: 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 Committed-by: Jan Beulich --- unmodified_drivers/linux-2.6/platform-pci/evtchn.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'unmodified_drivers') 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); } -- cgit v1.2.3