diff options
Diffstat (limited to 'app-emulation/vmware-modules/files')
8 files changed, 0 insertions, 980 deletions
diff --git a/app-emulation/vmware-modules/files/1.0.0.25-autoconf-generated.patch b/app-emulation/vmware-modules/files/1.0.0.25-autoconf-generated.patch deleted file mode 100644 index 151edadac17a..000000000000 --- a/app-emulation/vmware-modules/files/1.0.0.25-autoconf-generated.patch +++ /dev/null @@ -1,582 +0,0 @@ ---- vmblock-only/autoconf/cachecreate.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/cachecreate.c.new 2010-02-05 23:29:47.077574422 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - /* - * All kernels before 2.6.22 take 6 arguments. All kernels since ---- vmblock-only/autoconf/cachector.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/cachector.c.new 2010-02-05 23:32:39.086240477 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - /* - * Between 2.6.23 and 2.6.24-rc1 ctor prototype was changed from ---- vmblock-only/autoconf/cachector1.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/cachector1.c.new 2010-02-05 23:33:57.863050887 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - /* - * Between 2.6.27-rc1 and 2.6.27-rc2 ctor prototype was changed from ---- vmblock-only/autoconf/epoll.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/epoll.c.new 2010-02-05 23:34:03.782195888 +0100 -@@ -22,8 +22,12 @@ - * never had it, but some distros backported epoll patch. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - #include <linux/poll.h> ---- vmblock-only/autoconf/filldir1.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/filldir1.c.new 2010-02-05 23:34:09.582480900 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) - #include <linux/fs.h> ---- vmblock-only/autoconf/geninclude.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/geninclude.c.new 2010-02-05 23:34:16.775702411 +0100 -@@ -16,7 +16,12 @@ - * - *********************************************************/ - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #ifdef CONFIG_X86_VOYAGER - APATH/mach-voyager ---- vmblock-only/autoconf/getsb1.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/getsb1.c.new 2010-02-05 23:34:21.727106345 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) - ---- vmblock-only/autoconf/setnice.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/setnice.c.new 2010-02-05 23:34:27.326719885 +0100 -@@ -20,8 +20,12 @@ - * set_user_nice appeared in 2.4.21. But some distros - * backported it to older kernels. - */ --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21) - #include <linux/sched.h> ---- vmblock-only/autoconf/statfs1.c 2009-03-27 06:34:29.000000000 +0100 -+++ vmblock-only/autoconf/statfs1.c.new 2010-02-05 23:34:34.998496715 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) - #include <linux/fs.h> ---- vmblock-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100 -+++ vmblock-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100 -@@ -32,7 +32,12 @@ - #define INCLUDE_ALLOW_VMNIXMOD - #include "includeCheck.h" - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - #include "compat_version.h" - - /* ---- vmci-only/autoconf/epoll.c 2009-03-27 06:34:31.000000000 +0100 -+++ vmci-only/autoconf/epoll.c.new 2010-02-05 23:38:31.793973380 +0100 -@@ -22,8 +22,12 @@ - * never had it, but some distros backported epoll patch. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - #include <linux/poll.h> ---- vmci-only/autoconf/geninclude.c 2009-03-27 06:34:31.000000000 +0100 -+++ vmci-only/autoconf/geninclude.c.new 2010-02-05 23:38:45.704327021 +0100 -@@ -16,7 +16,12 @@ - * - *********************************************************/ - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #ifdef CONFIG_X86_VOYAGER - APATH/mach-voyager ---- vmci-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100 -+++ vmci-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100 -@@ -32,7 +32,12 @@ - #define INCLUDE_ALLOW_VMNIXMOD - #include "includeCheck.h" - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - #include "compat_version.h" - - /* ---- vmmon-only/autoconf/epoll.c 2010-02-05 23:39:45.361576611 +0100 -+++ vmmon-only/autoconf/epoll.c.new 2010-02-05 23:40:41.241245910 +0100 -@@ -22,8 +22,12 @@ - * never had it, but some distros backported epoll patch. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - #include <linux/poll.h> ---- vmmon-only/autoconf/geninclude.c 2010-02-05 23:39:45.362577852 +0100 -+++ vmmon-only/autoconf/geninclude.c.new 2010-02-05 23:40:50.833402279 +0100 -@@ -16,7 +16,12 @@ - * - *********************************************************/ - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #ifdef CONFIG_X86_VOYAGER - APATH/mach-voyager ---- vmmon-only/autoconf/nopage1.c 2010-02-05 23:39:45.363577625 +0100 -+++ vmmon-only/autoconf/nopage1.c.new 2010-02-05 23:40:58.674161808 +0100 -@@ -21,8 +21,12 @@ - * it uses new prototype. For 2.6.1 (and its -rc) and older do - * compile test. - */ --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 2) - #include <linux/mm.h> ---- vmmon-only/autoconf/setnice.c 2010-02-05 23:39:45.363577625 +0100 -+++ vmmon-only/autoconf/setnice.c.new 2010-02-05 23:41:12.017985901 +0100 -@@ -20,8 +20,12 @@ - * set_user_nice appeared in 2.4.21. But some distros - * backported it to older kernels. - */ --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21) - #include <linux/sched.h> ---- vmmon-only/autoconf/smpcall.c 2010-02-05 23:39:45.364577754 +0100 -+++ vmmon-only/autoconf/smpcall.c.new 2010-02-05 23:40:25.057954672 +0100 -@@ -21,8 +21,12 @@ - * Change happened between 2.6.26 and 2.6.27-rc1. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) - # error This compile test intentionally fails. ---- vmmon-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100 -+++ vmmon-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100 -@@ -32,7 +32,12 @@ - #define INCLUDE_ALLOW_VMNIXMOD - #include "includeCheck.h" - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - #include "compat_version.h" - - /* ---- vmnet-only/epoll.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/epoll.c.new 2010-02-05 23:43:43.642940246 +0100 -@@ -22,8 +22,12 @@ - * never had it, but some distros backported epoll patch. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - #include <linux/poll.h> ---- vmnet-only/geninclude.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/geninclude.c.new 2010-02-05 23:43:52.931081128 +0100 -@@ -16,7 +16,12 @@ - * - *********************************************************/ - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #ifdef CONFIG_X86_VOYAGER - APATH/mach-voyager ---- vmnet-only/netdev_has_dev_net.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/netdev_has_dev_net.c.new 2010-02-05 23:44:11.315557541 +0100 -@@ -21,8 +21,12 @@ - * It appeared between 2.6.25 and 2.6.26-rc1. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) - # error This compile test intentionally fails. ---- vmnet-only/netdev_has_net.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/netdev_has_net.c.new 2010-02-05 23:44:29.348948588 +0100 -@@ -27,8 +27,12 @@ - * as hopefully in few weeks all 2.6.24-rc1 users will be gone. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) - # error This compile test intentionally fails. ---- vmnet-only/nfhook_uses_skb.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/nfhook_uses_skb.c.new 2010-02-05 23:44:35.228702615 +0100 -@@ -23,8 +23,12 @@ - * 2.6.24-rc1. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 23) - # error This compile test intentionally fails. ---- vmnet-only/setnice.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/setnice.c.new 2010-02-05 23:44:45.613286546 +0100 -@@ -20,8 +20,12 @@ - * set_user_nice appeared in 2.4.21. But some distros - * backported it to older kernels. - */ --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21) - #include <linux/sched.h> ---- vmnet-only/sk_alloc.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/sk_alloc.c.new 2010-02-05 23:44:59.796490045 +0100 -@@ -21,8 +21,12 @@ - * This API change was introduced between 2.6.12-rc1 and 2.6.12-rc2. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13) - #include <net/sock.h> ---- vmnet-only/skblin.c 2009-03-27 06:34:28.000000000 +0100 -+++ vmnet-only/skblin.c.new 2010-02-05 23:45:17.276123591 +0100 -@@ -20,8 +20,12 @@ - * Detect whether skb_linearize takes one or two arguments. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 17) - /* ---- vmnet-only/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100 -+++ vmnet-only/driver-config.h 2010-02-03 00:13:29.608823892 +0100 -@@ -32,7 +32,12 @@ - #define INCLUDE_ALLOW_VMNIXMOD - #include "includeCheck.h" - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - #include "compat_version.h" - - /* ---- vsock-only/autoconf/cachecreate.c 2009-03-27 06:34:32.000000000 +0100 -+++ vsock-only/autoconf/cachecreate.c.new 2010-02-05 23:46:29.157369452 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - /* - * All kernels before 2.6.22 take 6 arguments. All kernels since ---- vsock-only/autoconf/epoll.c 2009-03-27 06:34:32.000000000 +0100 -+++ vsock-only/autoconf/epoll.c.new 2010-02-05 23:46:39.884406108 +0100 -@@ -22,8 +22,12 @@ - * never had it, but some distros backported epoll patch. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) - #include <linux/poll.h> ---- vsock-only/autoconf/filldir1.c 2009-03-27 06:34:32.000000000 +0100 -+++ vsock-only/autoconf/filldir1.c.new 2010-02-05 23:46:52.692243523 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) - #include <linux/fs.h> ---- vsock-only/autoconf/geninclude.c 2009-03-27 06:34:32.000000000 +0100 -+++ vsock-only/autoconf/geninclude.c.new 2010-02-05 23:46:58.292953391 +0100 -@@ -16,7 +16,12 @@ - * - *********************************************************/ - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #ifdef CONFIG_X86_VOYAGER - APATH/mach-voyager ---- vsock-only/autoconf/getsb1.c 2009-03-27 06:34:32.000000000 +0100 -+++ vsock-only/autoconf/getsb1.c.new 2010-02-05 23:47:07.516892747 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) - ---- vsock-only/autoconf/setnice.c 2009-03-27 06:34:32.000000000 +0100 -+++ vsock-only/autoconf/setnice.c.new 2010-02-05 23:47:16.829514462 +0100 -@@ -20,8 +20,12 @@ - * set_user_nice appeared in 2.4.21. But some distros - * backported it to older kernels. - */ --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21) - #include <linux/sched.h> ---- vsock-only/autoconf/sk_filter.c 2009-03-27 06:34:32.000000000 +0100 -+++ vsock-only/autoconf/sk_filter.c.new 2010-02-05 23:47:28.501825992 +0100 -@@ -23,8 +23,12 @@ - * This test will fail to build on kernels with the new interface. - */ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - /* - * We'd restrict this test to 2.4.21 and earlier kernels, but Mandrake's ---- vsock-only/autoconf/statfs1.c 2009-03-27 06:34:32.000000000 +0100 -+++ vsock-only/autoconf/statfs1.c.new 2010-02-05 23:47:41.174472911 +0100 -@@ -16,8 +16,12 @@ - * - *********************************************************/ - --#include <linux/autoconf.h> - #include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) -+#include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) - #include <linux/fs.h> ---- vsock-only/include/driver-config.h.old 2010-02-03 00:12:31.439000354 +0100 -+++ vsock-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0100 -@@ -32,7 +32,12 @@ - #define INCLUDE_ALLOW_VMNIXMOD - #include "includeCheck.h" - -+#include <linux/version.h> -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) - #include <linux/autoconf.h> -+#else -+#include <generated/autoconf.h> -+#endif - #include "compat_version.h" - - /* diff --git a/app-emulation/vmware-modules/files/1.0.0.25-makefile-include.patch b/app-emulation/vmware-modules/files/1.0.0.25-makefile-include.patch deleted file mode 100644 index 79f4331eb470..000000000000 --- a/app-emulation/vmware-modules/files/1.0.0.25-makefile-include.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -urN old/vmblock-only/Makefile.kernel work/vmblock-only/Makefile.kernel ---- old/vmblock-only/Makefile.kernel 2009-08-21 16:10:32.000000000 -0400 -+++ work/vmblock-only/Makefile.kernel 2009-08-21 16:11:34.000000000 -0400 -@@ -19,7 +19,7 @@ - - INCLUDE := -I$(SRCROOT)/include - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/setnice.c, -DVMW_HAVE_SET_USER_NICE, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c, -DVMW_HAVE_EPOLL, ) -diff -urN old/vmci-only/Makefile.kernel work/vmci-only/Makefile.kernel ---- old/vmci-only/Makefile.kernel 2009-08-21 16:10:32.000000000 -0400 -+++ work/vmci-only/Makefile.kernel 2009-08-21 16:11:47.000000000 -0400 -@@ -21,7 +21,7 @@ - - INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c, -DVMW_HAVE_EPOLL, ) - -diff -urN old/vmmon-only/Makefile.kernel work/vmmon-only/Makefile.kernel ---- old/vmmon-only/Makefile.kernel 2009-08-21 16:10:32.000000000 -0400 -+++ work/vmmon-only/Makefile.kernel 2009-08-21 16:12:48.000000000 -0400 -@@ -22,7 +22,7 @@ - INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \ - -I$(SRCROOT)/vmcore - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/nopage1.c, -DVMW_NOPAGE_261, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/skas1.c, -DVMW_SKAS_MMAP, ) -diff -urN old/vmnet-only/Makefile.kernel work/vmnet-only/Makefile.kernel ---- old/vmnet-only/Makefile.kernel 2009-08-21 16:10:32.000000000 -0400 -+++ work/vmnet-only/Makefile.kernel 2009-08-21 16:13:02.000000000 -0400 -@@ -19,7 +19,7 @@ - - INCLUDE := -I$(SRCROOT) - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/epoll.c, -DVMW_HAVE_EPOLL, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/sk_alloc.c,-DVMW_HAVE_SK_ALLOC_WITH_PROTO, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, ) -diff -urN old/vsock-only/linux/util.c work/vsock-only/linux/util.c ---- old/vsock-only/linux/util.c 2009-08-21 16:10:32.000000000 -0400 -+++ work/vsock-only/linux/util.c 2009-08-21 16:13:27.000000000 -0400 -@@ -154,7 +154,7 @@ - goto error; - } - -- Log(buf); -+ Log("%s", buf); - - return; - -diff -urN old/vsock-only/Makefile.kernel work/vsock-only/Makefile.kernel ---- old/vsock-only/Makefile.kernel 2009-08-21 16:10:32.000000000 -0400 -+++ work/vsock-only/Makefile.kernel 2009-08-21 16:13:41.000000000 -0400 -@@ -25,7 +25,7 @@ - INCLUDE += -I$(SRCROOT)/linux - INCLUDE += -I$(SRCROOT)/common - --EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) -+EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/epoll.c, -DVMW_HAVE_EPOLL, ) - EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/setnice.c, -DVMW_HAVE_SET_USER_NICE, ) - diff --git a/app-emulation/vmware-modules/files/1.0.0.25-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/1.0.0.25-makefile-kernel-dir.patch deleted file mode 100644 index 8df4d8694e34..000000000000 --- a/app-emulation/vmware-modules/files/1.0.0.25-makefile-kernel-dir.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile -index 0a9ffd6..4aa09e8 100644 ---- a/vmblock-only/Makefile -+++ b/vmblock-only/Makefile -@@ -29,9 +29,9 @@ SRCROOT = . - VM_UNAME = $(shell uname -r) - - # Header directory for the running kernel --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmblock - PRODUCT := @PRODUCT@ -diff --git a/vmci-only/Makefile b/vmci-only/Makefile -index 0a6c9c6..6cd0b6d 100644 ---- a/vmci-only/Makefile -+++ b/vmci-only/Makefile -@@ -29,9 +29,9 @@ SRCROOT = . - VM_UNAME = $(shell uname -r) - - # Header directory for the running kernel --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmci - PRODUCT := @PRODUCT@ -diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile -index d26e58c..f8a40f4 100644 ---- a/vmmon-only/Makefile -+++ b/vmmon-only/Makefile -@@ -29,9 +29,9 @@ SRCROOT = . - VM_UNAME = $(shell uname -r) - - # Header directory for the running kernel --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmmon - PRODUCT := @PRODUCT@ -diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile -index 4cabc30..568271a 100644 ---- a/vmnet-only/Makefile -+++ b/vmnet-only/Makefile -@@ -29,9 +29,9 @@ SRCROOT = . - VM_UNAME = $(shell uname -r) - - # Header directory for the running kernel --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vmnet - PRODUCT := @PRODUCT@ -diff --git a/vsock-only/Makefile b/vsock-only/Makefile -index a69bc22..8a74856 100644 ---- a/vsock-only/Makefile -+++ b/vsock-only/Makefile -@@ -29,9 +29,9 @@ SRCROOT = . - VM_UNAME = $(shell uname -r) - - # Header directory for the running kernel --HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include -+HEADER_DIR = $(KERNEL_DIR) - --BUILD_DIR = $(HEADER_DIR)/.. -+BUILD_DIR = $(KBUILD_OUTPUT) - - DRIVER := vsock - PRODUCT := ws diff --git a/app-emulation/vmware-modules/files/1.0.0.25-sema.patch b/app-emulation/vmware-modules/files/1.0.0.25-sema.patch deleted file mode 100644 index f5b06f3ccc0a..000000000000 --- a/app-emulation/vmware-modules/files/1.0.0.25-sema.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -ru vmware-modules-1.0.0.25-r2.orig/work/vmci-only/include/compat_semaphore.h vmware-modules-1.0.0.25-r2/work/vmci-only/include/compat_semaphore.h ---- vmware-modules-1.0.0.25-r2.orig/work/vmci-only/include/compat_semaphore.h 2011-01-11 21:55:57.016999997 +0100 -+++ vmware-modules-1.0.0.25-r2/work/vmci-only/include/compat_semaphore.h 2011-01-11 21:57:39.719999997 +0100 -@@ -45,5 +45,13 @@ - #endif - #endif - -+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) -+ #ifndef DECLARE_MUTEX -+ #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m) -+ #endif -+ #ifndef init_MUTEX -+ #define init_MUTEX(_m) sema_init(_m,1) -+ #endif -+#endif - - #endif /* __COMPAT_SEMAPHORE_H__ */ -diff -ru vmware-modules-1.0.0.25-r2.orig/work/vmmon-only/include/compat_semaphore.h vmware-modules-1.0.0.25-r2/work/vmmon-only/include/compat_semaphore.h ---- vmware-modules-1.0.0.25-r2.orig/work/vmmon-only/include/compat_semaphore.h 2011-01-11 21:55:57.028999997 +0100 -+++ vmware-modules-1.0.0.25-r2/work/vmmon-only/include/compat_semaphore.h 2011-01-11 21:58:57.529999998 +0100 -@@ -45,5 +45,13 @@ - #endif - #endif - -+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) -+ #ifndef DECLARE_MUTEX -+ #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m) -+ #endif -+ #ifndef init_MUTEX -+ #define init_MUTEX(_m) sema_init(_m,1) -+ #endif -+#endif - - #endif /* __COMPAT_SEMAPHORE_H__ */ -diff -ru vmware-modules-1.0.0.25-r2.orig/work/vmnet-only/compat_semaphore.h vmware-modules-1.0.0.25-r2/work/vmnet-only/compat_semaphore.h ---- vmware-modules-1.0.0.25-r2.orig/work/vmnet-only/compat_semaphore.h 2011-01-11 21:55:57.022999997 +0100 -+++ vmware-modules-1.0.0.25-r2/work/vmnet-only/compat_semaphore.h 2011-01-11 21:58:23.678999996 +0100 -@@ -45,5 +45,14 @@ - #endif - #endif - -+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) -+ #ifndef DECLARE_MUTEX -+ #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m) -+ #endif -+ #ifndef init_MUTEX -+ #define init_MUTEX(_m) sema_init(_m,1) -+ #endif -+#endif -+ - - #endif /* __COMPAT_SEMAPHORE_H__ */ -diff -ru vmware-modules-1.0.0.25-r2.orig/work/vmnet-only/vnetFilter.h vmware-modules-1.0.0.25-r2/work/vmnet-only/vnetFilter.h ---- vmware-modules-1.0.0.25-r2.orig/work/vmnet-only/vnetFilter.h 2011-01-11 21:55:57.020999997 +0100 -+++ vmware-modules-1.0.0.25-r2/work/vmnet-only/vnetFilter.h 2011-01-11 22:02:29.522999997 +0100 -@@ -203,5 +203,13 @@ - } - #include "vmware_pack_end.h" - VNet_SetLogLevel; -+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) -+ #ifndef DECLARE_MUTEX -+ #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m) -+ #endif -+ #ifndef init_MUTEX -+ #define init_MUTEX(_m) sema_init(_m,1) -+ #endif -+#endif - - #endif // ifndef _VNETFILTER_H_ -diff -ru vmware-modules-1.0.0.25-r2.orig/work/vsock-only/linux/af_vsock.h vmware-modules-1.0.0.25-r2/work/vsock-only/linux/af_vsock.h ---- vmware-modules-1.0.0.25-r2.orig/work/vsock-only/linux/af_vsock.h 2011-01-11 21:55:57.040999997 +0100 -+++ vmware-modules-1.0.0.25-r2/work/vsock-only/linux/af_vsock.h 2011-01-11 22:03:59.066999997 +0100 -@@ -88,4 +88,14 @@ - #endif - } VSockVmciSock; - -+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) -+ #ifndef DECLARE_MUTEX -+ #define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m) -+ #endif -+ #ifndef init_MUTEX -+ #define init_MUTEX(_m) sema_init(_m,1) -+ #endif -+#endif -+ -+ - #endif /* __AF_VSOCK_H__ */ diff --git a/app-emulation/vmware-modules/files/1.0.0.25-sk_sleep.patch b/app-emulation/vmware-modules/files/1.0.0.25-sk_sleep.patch deleted file mode 100644 index d1697a2d419f..000000000000 --- a/app-emulation/vmware-modules/files/1.0.0.25-sk_sleep.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- vsock-only/linux/af_vsock.c.orig 2010-08-04 14:07:01.000000000 -0400 -+++ vsock-only/linux/af_vsock.c 2010-08-04 14:07:42.000000000 -0400 -@@ -3188,7 +3188,7 @@ - * a notification of an error. - */ - timeout = sock_sndtimeo(sk, flags & O_NONBLOCK); -- compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); -+ compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); - - while (sk->compat_sk_state != SS_CONNECTED && sk->compat_sk_err == 0) { - if (timeout == 0) { -@@ -3211,7 +3211,7 @@ - goto outWaitError; - } - -- compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); -+ compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); - } - - if (sk->compat_sk_err) { -@@ -3223,7 +3223,7 @@ - } - - outWait: -- compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING); -+ compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING); - out: - release_sock(sk); - return err; -@@ -3430,7 +3430,7 @@ - - sk = sock->sk; - -- poll_wait(file, sk->compat_sk_sleep, wait); -+ poll_wait(file, compat_sk_sleep(sk), wait); - mask = 0; - - if (sk->compat_sk_err) { -@@ -4041,7 +4041,7 @@ - * Wait for room in the produce queue to enqueue our user's data. - */ - timeout = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT); -- compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); -+ compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); - - while (totalWritten < len) { - Bool sentWrote; -@@ -4080,7 +4080,7 @@ - goto outWait; - } - -- compat_cont_prepare_to_wait(sk->compat_sk_sleep, -+ compat_cont_prepare_to_wait(compat_sk_sleep(sk), - &wait, TASK_INTERRUPTIBLE); - } - -@@ -4163,7 +4163,7 @@ - if (totalWritten > 0) { - err = totalWritten; - } -- compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING); -+ compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING); - out: - release_sock(sk); - return err; -@@ -4386,7 +4386,7 @@ - timeout = sock_rcvtimeo(sk, flags & MSG_DONTWAIT); - copied = 0; - -- compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); -+ compat_init_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); - - while ((ready = VMCIQueue_BufReady(vsk->consumeQ, - vsk->produceQ, -@@ -4429,7 +4429,7 @@ - goto outWait; - } - -- compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); -+ compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); - } - - if (sk->compat_sk_err) { -@@ -4521,7 +4521,7 @@ - err = copied; - - outWait: -- compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING); -+ compat_finish_wait(compat_sk_sleep(sk), &wait, TASK_RUNNING); - out: - release_sock(sk); - return err; diff --git a/app-emulation/vmware-modules/files/1.0.0.25-unlocked_ioctl.patch b/app-emulation/vmware-modules/files/1.0.0.25-unlocked_ioctl.patch deleted file mode 100644 index f6250dc2e72f..000000000000 --- a/app-emulation/vmware-modules/files/1.0.0.25-unlocked_ioctl.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c -index 3cd4923..0d4f6df 100644 ---- a/vmmon-only/linux/driver.c -+++ b/vmmon-only/linux/driver.c -@@ -170,6 +170,7 @@ static int LinuxDriver_Open(struct inode *inode, struct file *filp); - static int LinuxDriver_Ioctl(struct inode *inode, struct file *filp, - u_int iocmd, unsigned long ioarg); - #if defined(HAVE_UNLOCKED_IOCTL) || defined(HAVE_COMPAT_IOCTL) -+#define VMW_HAVE_UNLOCKED_IOCTL - static long LinuxDriver_UnlockedIoctl(struct file *filp, - u_int iocmd, unsigned long ioarg); - #endif -diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c -index c83628d..eb4a707 100644 ---- a/vmmon-only/linux/hostif.c -+++ b/vmmon-only/linux/hostif.c -@@ -3411,7 +3413,7 @@ HostIFDoIoctl(struct file *filp, - if (filp->f_op->unlocked_ioctl) { - return filp->f_op->unlocked_ioctl(filp, iocmd, ioarg); - } --#endif -+#else - if (filp->f_op->ioctl) { - long err; - -@@ -3420,6 +3422,7 @@ HostIFDoIoctl(struct file *filp, - unlock_kernel(); - return err; - } -+#endif - return -ENOIOCTLCMD; - } - diff --git a/app-emulation/vmware-modules/files/apic.patch b/app-emulation/vmware-modules/files/apic.patch deleted file mode 100644 index 107da28ed976..000000000000 --- a/app-emulation/vmware-modules/files/apic.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- vmmon-only/linux/hostif.c.orig 2009-11-16 13:24:00.000000000 +0200 -+++ vmmon-only/linux/hostif.c 2009-11-16 13:08:56.000000000 +0200 -@@ -78,6 +78,8 @@ - #include "vmmonInt.h" - #include "versioned_atomic.h" - -+#include <asm/apic.h> -+ - #define UPTIME_FREQ CONST64(1000000) - - static struct { - diff --git a/app-emulation/vmware-modules/files/sched_h-2.6.32.patch b/app-emulation/vmware-modules/files/sched_h-2.6.32.patch deleted file mode 100644 index b7333f7f8541..000000000000 --- a/app-emulation/vmware-modules/files/sched_h-2.6.32.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ur vmci-only.before/linux/vmciKernelIf.c vmci-only/linux/vmciKernelIf.c ---- vmci-only.before/linux/vmciKernelIf.c 2010-01-02 14:56:31.000000000 -0500 -+++ vmci-only/linux/vmciKernelIf.c 2010-01-02 14:57:01.000000000 -0500 -@@ -36,6 +36,7 @@ - #include "compat_module.h" - - #include "compat_version.h" -+#include "compat_sched.h" - #include "compat_wait.h" - #include "compat_interrupt.h" - #include "compat_spinlock.h" -diff -ur vmnet-only.before/vnetUserListener.c vmnet-only/vnetUserListener.c ---- vmnet-only.before/vnetUserListener.c 2010-01-02 14:56:38.000000000 -0500 -+++ vmnet-only/vnetUserListener.c 2010-01-02 14:58:29.000000000 -0500 -@@ -32,6 +32,7 @@ - #include <linux/netdevice.h> - #include <linux/poll.h> - #include "compat_skbuff.h" -+#include "compat_sched.h" - #include "compat_wait.h" - #include "vnetInt.h" - |