Changeset 6845 in vbox for trunk/src/VBox/Runtime/r0drv

Timestamp:

Feb 7, 2008 12:50:50 PM (17 years ago)

Author:

vboxsync

Message:

Fix a soon to appear post-2.6.24 linux kernel issue dropping a macro definition. Used the opportunity to make the linux support driver use the-linux-kernel.h, too, and move common hacks there. Left the host driver specific things where they were.

File:

• trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h (modified) (3 diffs)

trunk/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h

@@ -64 +64 @@
 #include <asm/semaphore.h>
 #include <linux/module.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+# include <linux/moduleparam.h>
+#endif
+#include <linux/vermagic.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -80 +84 @@
 #include <linux/interrupt.h>
 #include <linux/completion.h>
+#include <linux/compiler.h>
+#ifndef HAVE_UNLOCKED_IOCTL /* linux/fs.h defines this */
+# include <linux/smp_lock.h>
+#endif
 /* For the shared folders module */
 #include <linux/vmalloc.h>
@@ -227 +235 @@
 #undef bool
 
-#endif
-
+/*
+ * There are post-2.6.24 kernels (confusingly with unchanged version number)
+ * which eliminate macros which were marked as deprecated.
+ */
+#ifndef __attribute_used__
+#define __attribute_used__ __used
+#endif
+
+#endif
+