[vbox-dev] IRQF_DISABLED removal in 4.1-rc1 Linux kernel

[Alessandro Suardi]

As per my post in the forums

 https://forums.virtualbox.org/viewtopic.php?f=10&t=67590

 the removal of IRQF_DISABLED in the 4.1-rc1 Linux kernel implies failure
 to build VirtualBox (4.3.26 for sure, but even trunk as of yesterday appeared
 to reference said flag in VBoxPci-linux.c)

 relevant email in
https://www.mail-archive.com/linux-usb@vger.kernel.org/msg57136.html
 appears to indicate that the flag has been a no-op for a while; a
simple extension to the
 kernel version checking lets the build go through - and my Win7 VM is
running so far.

Since I don't have enough expertise to tell whether the bandaid is
okay or if there's the
 need to amend other areas of the code to reimplement whatever IRQF_DISABLED was
 performing, I'll just post this as a build fix, waiting for a better
analysis :)


thanks, ciao,

--alessandro

"don't underestimate the things that I will do"

 (Adele, "Rolling In The Deep")
-------------- next part --------------
--- VBoxPci-linux.c.orig	2015-03-16 18:04:10.000000000 +0100
+++ VBoxPci-linux.c	2015-04-29 10:57:44.785497986 +0200
@@ -885,7 +885,7 @@
 #else
 
                      /* We don't allow interrupts sharing */
-# if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20)
+# if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 20) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0))
                      IRQF_DISABLED, /* keep irqs disabled when calling the action handler */
 # else
                      0,