Attached is a backward-compatible patch for linux (/usr/share/virtualbox/) that will permit vboxdrv to compile with the most recent linux kernel.
diff -ru virtualbox_4.0/src/vboxhost/vboxdrv/include/internal/iprt.h virtualbox_4.0_kaw//src/vboxhost/vboxdrv/include/internal/iprt.h
--- virtualbox_4.0/src/vboxhost/vboxdrv/include/internal/iprt.h 2011-01-18 13:57:59.000000000 -0600
+++ virtualbox_4.0_kaw//src/vboxhost/vboxdrv/include/internal/iprt.h 2011-02-04 14:07:48.000000000 -0600
@@ -40,7 +40,12 @@
&& !defined(RT_NO_EXPORT_SYMBOL)
# define bool linux_bool /* see r0drv/linux/the-linux-kernel.h */
# ifndef AUTOCONF_INCLUDED
-# include <linux/autoconf.h>
+# include <linux/version.h>
+# if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 37)
+# include <generated/autoconf.h>
+# else
+# include <linux/autoconf.h>
+# endif
# endif
# if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
# include <linux/version.h>
diff -ru virtualbox_4.0/src/vboxhost/vboxdrv/include/iprt/types.h virtualbox_4.0_kaw//src/vboxhost/vboxdrv/include/iprt/types.h
--- virtualbox_4.0/src/vboxhost/vboxdrv/include/iprt/types.h 2011-01-18 13:57:59.000000000 -0600
+++ virtualbox_4.0_kaw//src/vboxhost/vboxdrv/include/iprt/types.h 2011-02-04 12:35:29.000000000 -0600
@@ -102,7 +102,12 @@
# define false linux_false
# define uintptr_t linux_uintptr_t
# ifndef AUTOCONF_INCLUDED
-# include <linux/autoconf.h>
+# include <linux/version.h>
+# if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 37)
+# include <generated/autoconf.h>
+# else
+# include <linux/autoconf.h>
+# endif
# endif
# include <linux/types.h>
# include <linux/stddef.h>
diff -ru virtualbox_4.0/src/vboxhost/vboxdrv/r0drv/linux/the-linux-kernel.h virtualbox_4.0_kaw//src/vboxhost/vboxdrv/r0drv/linux/the-linux-kernel.h
--- virtualbox_4.0/src/vboxhost/vboxdrv/r0drv/linux/the-linux-kernel.h 2011-01-18 13:57:59.000000000 -0600
+++ virtualbox_4.0_kaw//src/vboxhost/vboxdrv/r0drv/linux/the-linux-kernel.h 2011-02-04 14:07:32.000000000 -0600
@@ -34,10 +34,14 @@
#include <iprt/types.h>
#define bool linux_bool
+#include <linux/version.h>
#ifndef AUTOCONF_INCLUDED
-# include <linux/autoconf.h>
+# if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 37)
+# include <generated/autoconf.h>
+# else
+# include <linux/autoconf.h>
+# endif
#endif
-#include <linux/version.h>
/* We only support 2.4 and 2.6 series kernels */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)
diff -ru virtualbox_4.0/src/vboxhost/vboxdrv/SUPDrvInternal.h virtualbox_4.0_kaw//src/vboxhost/vboxdrv/SUPDrvInternal.h
--- virtualbox_4.0/src/vboxhost/vboxdrv/SUPDrvInternal.h 2011-01-18 13:57:59.000000000 -0600
+++ virtualbox_4.0_kaw//src/vboxhost/vboxdrv/SUPDrvInternal.h 2011-02-04 14:08:53.000000000 -0600
@@ -75,10 +75,14 @@
RT_C_DECLS_END
#elif defined(RT_OS_LINUX)
+# include <linux/version.h>
# ifndef AUTOCONF_INCLUDED
-# include <linux/autoconf.h>
+# if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 37)
+# include <generated/autoconf.h>
+# else
+# include <linux/autoconf.h>
+# endif
# endif
-# include <linux/version.h>
# if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
# define MODVERSIONS
# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 71)
diff -ru virtualbox_4.0/src/vboxhost/vboxnetadp/include/internal/iprt.h virtualbox_4.0_kaw//src/vboxhost/vboxnetadp/include/internal/iprt.h
--- virtualbox_4.0/src/vboxhost/vboxnetadp/include/internal/iprt.h 2011-01-18 13:57:59.000000000 -0600
+++ virtualbox_4.0_kaw//src/vboxhost/vboxnetadp/include/internal/iprt.h 2011-02-04 14:10:04.000000000 -0600
@@ -40,7 +40,12 @@
&& !defined(RT_NO_EXPORT_SYMBOL)
# define bool linux_bool /* see r0drv/linux/the-linux-kernel.h */
# ifndef AUTOCONF_INCLUDED
-# include <linux/autoconf.h>
+# include <linux/version.h>
+# if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 37)
+# include <generated/autoconf.h>
+# else
+# include <linux/autoconf.h>
+# endif
# endif
# if defined(CONFIG_MODVERSIONS) && !defined(MODVERSIONS)
# include <linux/version.h>
diff -ru virtualbox_4.0/src/vboxhost/vboxnetadp/include/iprt/types.h virtualbox_4.0_kaw//src/vboxhost/vboxnetadp/include/iprt/types.h
--- virtualbox_4.0/src/vboxhost/vboxnetadp/include/iprt/types.h 2011-01-18 13:57:59.000000000 -0600
+++ virtualbox_4.0_kaw//src/vboxhost/vboxnetadp/include/iprt/types.h 2011-02-04 14:09:36.000000000 -0600
@@ -102,7 +102,12 @@
# define false linux_false
# define uintptr_t linux_uintptr_t
# ifndef AUTOCONF_INCLUDED
-# include <linux/autoconf.h>
+# include <linux/version.h>
+# if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 37)
+# include <generated/autoconf.h>
+# else
+# include <linux/autoconf.h>
+# endif
# endif
# include <linux/types.h>
# include <linux/stddef.h>
diff -ru virtualbox_4.0/src/vboxhost/vboxnetadp/r0drv/linux/the-linux-kernel.h virtualbox_4.0_kaw//src/vboxhost/vboxnetadp/r0drv/linux/the-linux-kernel.h
--- virtualbox_4.0/src/vboxhost/vboxnetadp/r0drv/linux/the-linux-kernel.h 2011-01-18 13:57:59.000000000 -0600
+++ virtualbox_4.0_kaw//src/vboxhost/vboxnetadp/r0drv/linux/the-linux-kernel.h 2011-02-04 14:10:40.000000000 -0600
@@ -34,10 +34,14 @@
#include <iprt/types.h>
#define bool linux_bool
-#ifndef AUTOCONF_INCLUDED
-# include <linux/autoconf.h>
-#endif
#include <linux/version.h>
+# ifndef AUTOCONF_INCLUDED
+# if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 37)
+# include <generated/autoconf.h>
+# else
+# include <linux/autoconf.h>
+# endif
+# endif
/* We only support 2.4 and 2.6 series kernels */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)
diff -ru virtualbox_4.0/src/vboxhost/vboxnetflt/include/iprt/types.h virtualbox_4.0_kaw//src/vboxhost/vboxnetflt/include/iprt/types.h
--- virtualbox_4.0/src/vboxhost/vboxnetflt/include/iprt/types.h 2011-01-18 13:57:59.000000000 -0600
+++ virtualbox_4.0_kaw//src/vboxhost/vboxnetflt/include/iprt/types.h 2011-02-04 14:11:19.000000000 -0600
@@ -102,7 +102,12 @@
# define false linux_false
# define uintptr_t linux_uintptr_t
# ifndef AUTOCONF_INCLUDED
-# include <linux/autoconf.h>
+# include <linux/version.h>
+# if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 37)
+# include <generated/autoconf.h>
+# else
+# include <linux/autoconf.h>
+# endif
# endif
# include <linux/types.h>
# include <linux/stddef.h>
diff -ru virtualbox_4.0/src/vboxhost/vboxnetflt/r0drv/linux/the-linux-kernel.h virtualbox_4.0_kaw//src/vboxhost/vboxnetflt/r0drv/linux/the-linux-kernel.h
--- virtualbox_4.0/src/vboxhost/vboxnetflt/r0drv/linux/the-linux-kernel.h 2011-01-18 13:57:59.000000000 -0600
+++ virtualbox_4.0_kaw//src/vboxhost/vboxnetflt/r0drv/linux/the-linux-kernel.h 2011-02-04 14:12:08.000000000 -0600
@@ -34,10 +34,14 @@
#include <iprt/types.h>
#define bool linux_bool
+#include <linux/version.h>
#ifndef AUTOCONF_INCLUDED
-# include <linux/autoconf.h>
+# if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 37)
+# include <generated/autoconf.h>
+# else
+# include <linux/autoconf.h>
+# endif
#endif
-#include <linux/version.h>
/* We only support 2.4 and 2.6 series kernels */
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)
signature.asc
Description: This is a digitally signed message part
_______________________________________________ vbox-dev mailing list [email protected] http://vbox.innotek.de/mailman/listinfo/vbox-dev
