From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Nl1aO-0004Ac-OQ for garchives@archives.gentoo.org; Fri, 26 Feb 2010 14:54:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2665E08FB; Fri, 26 Feb 2010 14:54:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3FFE2E08FB for ; Fri, 26 Feb 2010 14:54:35 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id C239E1B46A3 for ; Fri, 26 Feb 2010 14:54:34 +0000 (UTC) Received: from vadimk by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1Nl1aM-0000tz-2t for gentoo-commits@lists.gentoo.org; Fri, 26 Feb 2010 14:54:34 +0000 From: "Vadim Kuznetsov (vadimk)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, vadimk@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in app-emulation/vmware-modules/files: 1.0.0.24-autoconf-generated.patch 1.0.0.25-autoconf-generated.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: 1.0.0.24-autoconf-generated.patch 1.0.0.25-autoconf-generated.patch X-VCS-Directories: app-emulation/vmware-modules/files X-VCS-Committer: vadimk X-VCS-Committer-Name: Vadim Kuznetsov Content-Type: text/plain; charset=utf8 Message-Id: Sender: Vadim Kuznetsov Date: Fri, 26 Feb 2010 14:54:34 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: f576a69a-10eb-4ca6-ba78-ded38e609ca8 X-Archives-Hash: 9f56431d331c3d2c6a7becbfb25e279c vadimk 10/02/26 14:54:34 Added: 1.0.0.24-autoconf-generated.patch 1.0.0.25-autoconf-generated.patch Log: Bug 301320 (Portage version: 2.1.7.17/cvs/Linux x86_64) Revision Changes Path 1.1 app-emulation/vmware-modules/files/1.0.0.24-autoconf= -generated.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmwa= re-modules/files/1.0.0.24-autoconf-generated.patch?rev=3D1.1&view=3Dmarku= p plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmwa= re-modules/files/1.0.0.24-autoconf-generated.patch?rev=3D1.1&content-type= =3Dtext/plain Index: 1.0.0.24-autoconf-generated.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- vmblock-only/autoconf/cachecreate.c 2009-03-27 06:34:29.000000000 +01= 00 +++ vmblock-only/autoconf/cachecreate.c.new 2010-02-05 23:29:47.077574422= +0100 @@ -16,8 +16,12 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 /* * 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 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 /* * 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 +010= 0 +++ vmblock-only/autoconf/cachector1.c.new 2010-02-05 23:33:57.863050887 = +0100 @@ -16,8 +16,12 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 /* * 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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) #include --- 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 +0= 100 @@ -16,8 +16,12 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) #include --- vmblock-only/autoconf/geninclude.c 2009-03-27 06:34:29.000000000 +010= 0 +++ vmblock-only/autoconf/geninclude.c.new 2010-02-05 23:34:16.775702411 = +0100 @@ -16,7 +16,12 @@ * *********************************************************/ =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif =20 #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 +010= 0 @@ -16,8 +16,12 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) =20 --- 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 +01= 00 @@ -20,8 +20,12 @@ * set_user_nice appeared in 2.4.21. But some distros * backported it to older kernels. */ -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21) #include --- 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 +01= 00 @@ -16,8 +16,12 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) #include --- vmblock-only/include/driver-config.h.old 2010-02-03 00:12:31.43900035= 4 +0100 +++ vmblock-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0= 100 @@ -32,7 +32,12 @@ #define INCLUDE_ALLOW_VMNIXMOD #include "includeCheck.h" +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif #include "compat_version.h" =20 /* --- 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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) #include --- 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 +01= 00 @@ -16,7 +16,12 @@ * *********************************************************/ =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif =20 #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" =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif #include "compat_version.h" =20 /* --- 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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) #include --- 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 +0= 100 @@ -16,7 +16,12 @@ * *********************************************************/ =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif =20 #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 #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 2) #include --- 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 #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21) #include --- 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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #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 +010= 0 @@ -32,7 +32,12 @@ #define INCLUDE_ALLOW_VMNIXMOD #include "includeCheck.h" =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif #include "compat_version.h" =20 /* --- 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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) #include --- 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 @@ * *********************************************************/ =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif =20 #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 +01= 00 @@ -21,8 +21,12 @@ * It appeared between 2.6.25 and 2.6.26-rc1. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #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 #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21) #include --- 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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13) #include --- 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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE <=3D KERNEL_VERSION(2, 6, 17) /* --- vmnet-only/socket.c 2009-03-27 06:34:28.000000000 +0100 +++ vmnet-only/socket.c.new 2010-02-05 23:45:30.149065913 +0100 @@ -21,8 +21,12 @@ * It got renamed from wmem_alloc sometime during 2.5.x. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) #include --- 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" =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif #include "compat_version.h" =20 /* --- 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 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 /* * 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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) #include --- 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 +010= 0 @@ -16,8 +16,12 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) #include --- 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 +0= 100 @@ -16,7 +16,12 @@ * *********************************************************/ =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif =20 #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 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) =20 --- 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 #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21) #include --- 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 +01= 00 @@ -23,8 +23,12 @@ * This test will fail to build on kernels with the new interface. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 /* * 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 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) #include --- 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 +010= 0 @@ -32,7 +32,12 @@ #define INCLUDE_ALLOW_VMNIXMOD #include "includeCheck.h" =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif #include "compat_version.h" =20 /* 1.1 app-emulation/vmware-modules/files/1.0.0.25-autoconf= -generated.patch file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmwa= re-modules/files/1.0.0.25-autoconf-generated.patch?rev=3D1.1&view=3Dmarku= p plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/vmwa= re-modules/files/1.0.0.25-autoconf-generated.patch?rev=3D1.1&content-type= =3Dtext/plain Index: 1.0.0.25-autoconf-generated.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- vmblock-only/autoconf/cachecreate.c 2009-03-27 06:34:29.000000000 +01= 00 +++ vmblock-only/autoconf/cachecreate.c.new 2010-02-05 23:29:47.077574422= +0100 @@ -16,8 +16,12 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 /* * 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 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 /* * 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 +010= 0 +++ vmblock-only/autoconf/cachector1.c.new 2010-02-05 23:33:57.863050887 = +0100 @@ -16,8 +16,12 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 /* * 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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) #include --- 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 +0= 100 @@ -16,8 +16,12 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) #include --- vmblock-only/autoconf/geninclude.c 2009-03-27 06:34:29.000000000 +010= 0 +++ vmblock-only/autoconf/geninclude.c.new 2010-02-05 23:34:16.775702411 = +0100 @@ -16,7 +16,12 @@ * *********************************************************/ =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif =20 #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 +010= 0 @@ -16,8 +16,12 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) =20 --- 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 +01= 00 @@ -20,8 +20,12 @@ * set_user_nice appeared in 2.4.21. But some distros * backported it to older kernels. */ -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21) #include --- 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 +01= 00 @@ -16,8 +16,12 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) #include --- vmblock-only/include/driver-config.h.old 2010-02-03 00:12:31.43900035= 4 +0100 +++ vmblock-only/include/driver-config.h 2010-02-03 00:13:29.608823892 +0= 100 @@ -32,7 +32,12 @@ #define INCLUDE_ALLOW_VMNIXMOD #include "includeCheck.h" +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif #include "compat_version.h" =20 /* --- 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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) #include --- 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 +01= 00 @@ -16,7 +16,12 @@ * *********************************************************/ =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif =20 #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" =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif #include "compat_version.h" =20 /* --- 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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) #include --- 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 +0= 100 @@ -16,7 +16,12 @@ * *********************************************************/ =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif =20 #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 #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 2) #include --- 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 #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21) #include --- 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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #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 +010= 0 @@ -32,7 +32,12 @@ #define INCLUDE_ALLOW_VMNIXMOD #include "includeCheck.h" =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif #include "compat_version.h" =20 /* --- 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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) #include --- 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 @@ * *********************************************************/ =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif =20 #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 +01= 00 @@ -21,8 +21,12 @@ * It appeared between 2.6.25 and 2.6.26-rc1. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #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 #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21) #include --- 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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 13) #include --- 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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE <=3D 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" =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif #include "compat_version.h" =20 /* --- 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 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 /* * 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. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) #include --- 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 +010= 0 @@ -16,8 +16,12 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20) #include --- 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 +0= 100 @@ -16,7 +16,12 @@ * *********************************************************/ =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif =20 #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 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) =20 --- 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 #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 21) #include --- 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 +01= 00 @@ -23,8 +23,12 @@ * This test will fail to build on kernels with the new interface. */ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 /* * 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 @@ * *********************************************************/ =20 -#include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) +#include +#else +#include +#endif =20 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) #include --- 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 +010= 0 @@ -32,7 +32,12 @@ #define INCLUDE_ALLOW_VMNIXMOD #include "includeCheck.h" =20 +#include +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 33) #include +#else +#include +#endif #include "compat_version.h" =20 /*