# HG changeset patch # User Olaf Hering <olaf@aepfle.de> # Date 1347038133 -7200 # Node ID bfa53b123b12884aa564a47104ad1373d8d16157 # Parent bb85bbccb1c9d802c92dd3fe00841368966ff623 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> diff -r bb85bbccb1c9 -r bfa53b123b12 unmodified_drivers/linux-2.6/platform-pci/evtchn.c --- 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); }