From edd6aee6de55566e2ef2018fe0eb3489bfbebeca Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 12 Sep 2012 14:48:04 +0100 Subject: [PATCH] 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 xen-unstable changeset: 25837:87cb4b6f53d3 xen-unstable date: Mon Sep 10 10:54:13 2012 +0200 --- unmodified_drivers/linux-2.6/platform-pci/evtchn.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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); }