Bug 322245, Bug 330019

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

9 files changed, 348 insertions, 8 deletions

diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog
index c88f5cbe2504..afe7cb2c7cba 100644
--- a/app-emulation/vmware-modules/ChangeLog
+++ b/app-emulation/vmware-modules/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/vmware-modules
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.57 2010/05/03 16:53:39 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.58 2010/08/04 19:01:30 vadimk Exp $
+
+  04 Aug 2010; Vadim Kuznetsov <vadimk@gentoo.org>
+  +files/1.0.0.24-sk_sleep.patch, vmware-modules-1.0.0.24-r1.ebuild,
+  +files/1.0.0.25-sk_sleep.patch, vmware-modules-1.0.0.25-r1.ebuild,
+  +files/1.0.0.26-iommu_map.patch, vmware-modules-1.0.0.26.ebuild,
+  +files/1.0.0.26-sk_sleep.patch:
+  patches for 2.6.35 kernel. Bug 322245, Bug 330019
 
   03 May 2010; Vadim Kuznetsov <vadimk@gentoo.org>
   vmware-modules-1.0.0.25-r1.ebuild, vmware-modules-1.0.0.26.ebuild,
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest
index 3dfaec10ad5f..9b54bc34c884 100644
--- a/app-emulation/vmware-modules/Manifest
+++ b/app-emulation/vmware-modules/Manifest
@@ -2,12 +2,16 @@ AUX 1.0.0.24-autoconf-generated.patch 18142 RMD160 05064550c8f4308bf803298500dec
 AUX 1.0.0.24-kernel-2.6.29.patch 10343 RMD160 4c93cab9f129a279671aa82af989121b3bf1f191 SHA1 1fcd62b30ca2a15c82ffc82924eef3447a4a4e08 SHA256 7bda64e6c0fb2fd30f71b38fa0920169356913e17bb8802ffc1e57622a0dd79c
 AUX 1.0.0.24-kernel-2.6.30.patch 1062 RMD160 8c02543ffcd46db13f179a63c589315f103b6c22 SHA1 f4d8030f1197788d9e2263ab4e3e861652702cd3 SHA256 deef76da29aec2aff33a0fe816faa1c4b61cb27858cdd6c1af70f9eaf9cde158
 AUX 1.0.0.24-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd453c6122fe17 SHA1 9a08768a9923d8259346f89ae78deae878b68df9 SHA256 fd583c13433bb3ddc64a21af6c472e3c6a2747990118a22881d2b48c16e5655f
+AUX 1.0.0.24-sk_sleep.patch 2953 RMD160 2d71cd394b8a46510a4e3ecc0923e6dfda5e7cd6 SHA1 bbc2ccd8aa45572013f67adb5fcac70c9e76fc1c SHA256 01cec0a08b94771d40dedad4c4e9970c16d8c25e5cc08630786cc1343ead7cc6
 AUX 1.0.0.24-vmnet-2.6.31.patch 13974 RMD160 84af8197b341ccea2fdda39225f9259ccdbb4a2d SHA1 745c973cce7c220f2f5d6853d5ede61738fdd729 SHA256 b8391b3ecb7a15c1763b2eace1e747f73f8ace3c1125b5402b8662d7b29298b5
 AUX 1.0.0.25-autoconf-generated.patch 17674 RMD160 38343d24d8cdfd7e312f3e60cf87f7236da6df22 SHA1 6e427c26f1a1efafff4a1c8623ef9ada874540e5 SHA256 d35b879cb950373939d3cef32e56be87f5b216ece3fe12af5e04c2c7c146a394
 AUX 1.0.0.25-makefile-include.patch 3185 RMD160 a3aa2f7cb3a51c96be13080061543d9664d98096 SHA1 df61745eeb49f517a9b7fb882ec0baab772544dd SHA256 50b529606062794d90083a590e05966b3420f1f9c6648863bd0ff360c17d9b34
 AUX 1.0.0.25-makefile-kernel-dir.patch 2129 RMD160 885b638c78cb0663d0d55682bafd453c6122fe17 SHA1 9a08768a9923d8259346f89ae78deae878b68df9 SHA256 fd583c13433bb3ddc64a21af6c472e3c6a2747990118a22881d2b48c16e5655f
+AUX 1.0.0.25-sk_sleep.patch 2953 RMD160 39e0ae852ab54f84d40bdd9bfc343e3ae3742882 SHA1 875e4195420f52784605ad013dd77da59b0c3511 SHA256 0c318c8f54b55f6adaade2cdd805ccf8cb04a9ce279bce2382e7e4d1fd78d33f
+AUX 1.0.0.26-iommu_map.patch 908 RMD160 80eaf9032f1a7b6793e1921880240b76456f92a7 SHA1 11c10e8ca7bd74eb2f430522373bf8c5827151b1 SHA256 641c1db195f65a46dccbd4757d34dca6f7ea558b625a3953f980dc5601208586
 AUX 1.0.0.26-makefile-include.patch 2791 RMD160 8665507d2b565931dc13a5f49eec6e33205d42fb SHA1 d48ca9316e65d536e50d07dfe945a6ff195be7cd SHA256 ac676433ca499268bd6a1f0d7d904a44095bb1a777ad31d055e8c4990eea586c
 AUX 1.0.0.26-makefile-kernel-dir.patch 2201 RMD160 22b81e2c3c347ac6bad3afef15eea31250c34f2a SHA1 033160ded8fda76e6f016040cc4bb3f4ca0dd603 SHA256 780b79fcc6e8e836632f4542ac6c3da2d475b3ad1e2e88e1c51aea849a5172c7
+AUX 1.0.0.26-sk_sleep.patch 3729 RMD160 05fa6b333109cba2390aa7c089f54ff84be57c38 SHA1 20db7877ebceb924640e8215b4f37e8d6984e653 SHA256 cbcd23202896c7d11d2627639999b3f3e021190658a94df08de1116f7a92237c
 AUX apic.patch 294 RMD160 ab0d6fea359f66ccd735cd3bc830442f6f6baa39 SHA1 537f1a903b94ea379003cf4e50c9507ae403c595 SHA256 6902f8dd82d48f479a3e5647e3bd7125d073f242dd85a5b2ddfd51f4ea8f663c
 AUX patches/000_all_makefile-include-directory.patch 342 RMD160 ae8b7c2e628681fff153bfa10242e62df5ab2e10 SHA1 be4f203063e676dc022ce600e15479b6ea56b954 SHA256 2da16602ef3c4cb040ac80a9fed18660fadcae2e843f425da0872f50aa5356db
 AUX patches/020_all_epoll-def-warnings.patch 435 RMD160 b9152d9af93862c99c72abc1ef97639351d82141 SHA1 d0a40f0483a144fc98d02213c6c63b2e2ddb9f66 SHA256 2033f23fc8d696e1a9d20c6c446703166ea82a4e5e448494e6a52ef09bac7521
@@ -28,8 +32,8 @@ DIST vmware-modules-1.0.0.26.amd64.tar.bz2 630507 RMD160 99008f4bac64b142b826237
 DIST vmware-modules-1.0.0.26.x86.tar.bz2 630393 RMD160 f43fd73be421cac84a1b04f1bd2d864db5617206 SHA1 6341733ac047127e4c9a555fcc3c41b936729cda SHA256 72b274e9a6261c218ff2ff21b1264c598d25eebc7eb6928c8c578b4f41669e4a
 EBUILD vmware-modules-1.0.0.15-r1.ebuild 311 RMD160 910dd70caac0af5c1bdb6d714b96f9c134cbdd8a SHA1 c56288915c67790e3b38207e14598923203b2c7c SHA256 dbce7d028f4fe0f042323a7e05754e311366ac33feb7361dab63af70017683f7
 EBUILD vmware-modules-1.0.0.15-r2.ebuild 445 RMD160 d16a678a0c9291289be89006b74782aeb0ba5a7a SHA1 c27bc611caae5e0b4afdc45ed5d62ee238a43b1e SHA256 f387e8c45b0b2fcee19b80a66dd3497981c54297fd9d21b7e01c60fb7e39a65d
-EBUILD vmware-modules-1.0.0.24-r1.ebuild 1996 RMD160 fa3489c03b4969c8dc13ef1abbbc0f5f2f51abbd SHA1 e9aafc9139cfaa99710a9bbe3932c282e986de7b SHA256 ae120390719de2d88368ca6721edfa7b06e638dfa2f68d03a8e733a1962caffc
-EBUILD vmware-modules-1.0.0.25-r1.ebuild 1925 RMD160 52659155b6cb718fe5962b8ae3bd82326b8eeb62 SHA1 284f32a402b2f0934e86f63a147b14b998721270 SHA256 84e0d22b3aca8d52441e1bb713ac7af0d7b3498d8938032177c777213d76fc64
-EBUILD vmware-modules-1.0.0.26.ebuild 1828 RMD160 af9ffee94a1a1ee981cd4508e7193bdc8d6b2f4f SHA1 fab345cbda789428a4296ed981eaf11d02108693 SHA256 6bc057431620a4c7a6796ace33f43eb1f69bfb7307af1b8c51b1ac84edd62aa6
-MISC ChangeLog 13004 RMD160 e29a657efcca9325e647d43ab35aa3e4de8af8b3 SHA1 13f306c6d7abdb0710bf517f2a4c8737be461e6a SHA256 d4902daea3c0c28afa3c2fe92c2653cb7e38aa14de0e9e7ae6c7ad4699c6cad7
+EBUILD vmware-modules-1.0.0.24-r1.ebuild 2059 RMD160 b7e8ec8509cec3df79a1e1c60e9f7ce6a7063402 SHA1 b14b5b4c02c93990e0ce94105a236bbc7559c474 SHA256 7afef8c3b65c858fca15174f81432537e8a04dd1bb0ff0bfcfdf61de4dbfd0f6
+EBUILD vmware-modules-1.0.0.25-r1.ebuild 2048 RMD160 c5d094bba3250b2bc28b16949a56786693b78cc5 SHA1 a27c23818e24f4cfd52078afbb5f8e60bf3dcac3 SHA256 3dee5dbe66aefb5375d82bb3a4e5b8be85d8c5678a7bca70975b2f1f70ceb4a4
+EBUILD vmware-modules-1.0.0.26.ebuild 1955 RMD160 513db378198a3d6f8373d4d8a89c2f79a2bdca10 SHA1 eade0338156b104e0511cc7d21585e7771bcb896 SHA256 f158d8dcf6f066ec4571f7e74d96189ae7fad3092fbfeb681be01aad0657036e
+MISC ChangeLog 13347 RMD160 cf61c86f31d4342eae19b82ec515b769dac62849 SHA1 89ba7d4e89e0196bd6bace37c1e75dbbd4d814e2 SHA256 cba81bbd902d25af8bd9db79808ac1e67d60a6438a97af1763037c53d92e19a2
 MISC metadata.xml 288 RMD160 da2ee1499dd87693b63592a337d8352494cb9652 SHA1 e1b50a587afb7878e21828a957a6838e7d08e4e8 SHA256 100017b3059be218965923798780ab195dafaa893f98088592fb5b299e686c37
diff --git a/app-emulation/vmware-modules/files/1.0.0.24-sk_sleep.patch b/app-emulation/vmware-modules/files/1.0.0.24-sk_sleep.patch
new file mode 100644
index 000000000000..cdf76b0d8983
--- /dev/null
+++ b/app-emulation/vmware-modules/files/1.0.0.24-sk_sleep.patch
@@ -0,0 +1,92 @@
+--- vsock-only/linux/af_vsock.c.orig	2009-03-27 01:34:32.000000000 -0400
++++ vsock-only/linux/af_vsock.c	2010-08-04 14:12:13.000000000 -0400
+@@ -3149,7 +3149,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) {
+@@ -3172,7 +3172,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) {
+@@ -3184,7 +3184,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;
+@@ -3391,7 +3391,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) {
+@@ -3992,7 +3992,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;
+@@ -4031,7 +4031,7 @@
+             goto outWait;
+          }
+ 
+-         compat_cont_prepare_to_wait(sk->compat_sk_sleep,
++         compat_cont_prepare_to_wait(compat_sk_sleep(sk),
+                                      &wait, TASK_INTERRUPTIBLE);
+       }
+ 
+@@ -4114,7 +4114,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;
+@@ -4337,7 +4337,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,
+@@ -4380,7 +4380,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) {
+@@ -4472,7 +4472,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-sk_sleep.patch b/app-emulation/vmware-modules/files/1.0.0.25-sk_sleep.patch
new file mode 100644
index 000000000000..d1697a2d419f
--- /dev/null
+++ b/app-emulation/vmware-modules/files/1.0.0.25-sk_sleep.patch
@@ -0,0 +1,92 @@
+--- 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.26-iommu_map.patch b/app-emulation/vmware-modules/files/1.0.0.26-iommu_map.patch
new file mode 100644
index 000000000000..0690ac38f5f3
--- /dev/null
+++ b/app-emulation/vmware-modules/files/1.0.0.26-iommu_map.patch
@@ -0,0 +1,20 @@
+--- vmmon-only/linux/iommu.c.orig	2010-01-22 23:50:32.000000000 -0500
++++ vmmon-only/linux/iommu.c	2010-08-04 14:18:34.000000000 -0400
+@@ -153,7 +153,7 @@
+          map_to =  PPN_2_PA(mpn);
+          map_prot = IOMMU_READ | IOMMU_WRITE;
+       }
+-      if ((status = iommu_map_range(vmLinux->iommuDomain,
++      if ((status = iommu_map(vmLinux->iommuDomain,
+                                     PPN_2_PA(ppn),
+                                     map_to, PAGE_SIZE, map_prot))) {
+          printk(KERN_ERR "%s: IOMMU Mapping of PPN 0x%x -> MPN 0x%x "
+@@ -400,7 +400,7 @@
+ 
+    /* Relinquish the IOMMU domain used by this VM. */
+    for (ppn = 0; ppn < vmLinux->numPages; ppn++) {
+-      iommu_unmap_range(vmLinux->iommuDomain, PPN_2_PA(ppn), PAGE_SIZE);
++      iommu_unmap(vmLinux->iommuDomain, PPN_2_PA(ppn), PAGE_SIZE);
+    }
+    if (vmLinux->iommuDomain) {
+       iommu_domain_free(vmLinux->iommuDomain);
diff --git a/app-emulation/vmware-modules/files/1.0.0.26-sk_sleep.patch b/app-emulation/vmware-modules/files/1.0.0.26-sk_sleep.patch
new file mode 100644
index 000000000000..93b3df62b8c8
--- /dev/null
+++ b/app-emulation/vmware-modules/files/1.0.0.26-sk_sleep.patch
@@ -0,0 +1,119 @@
+--- vsock-only/linux/af_vsock.c.orig	2010-01-22 20:09:09.000000000 -0500
++++ vsock-only/linux/af_vsock.c	2010-08-04 14:16:34.000000000 -0400
+@@ -3221,7 +3221,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) {
+@@ -3244,7 +3244,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) {
+@@ -3256,7 +3256,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;
+@@ -3316,7 +3316,7 @@
+     * upon connection establishment.
+     */
+    timeout = sock_sndtimeo(listener, flags & O_NONBLOCK);
+-   compat_init_prepare_to_wait(listener->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++   compat_init_prepare_to_wait(compat_sk_sleep(listener), &wait, TASK_INTERRUPTIBLE);
+ 
+    while ((connected = VSockVmciDequeueAccept(listener)) == NULL &&
+           listener->compat_sk_err == 0) {
+@@ -3332,7 +3332,7 @@
+          goto outWait;
+       }
+ 
+-      compat_cont_prepare_to_wait(listener->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
++      compat_cont_prepare_to_wait(compat_sk_sleep(listener), &wait, TASK_INTERRUPTIBLE);
+    }
+ 
+    if (listener->compat_sk_err) {
+@@ -3366,7 +3366,7 @@
+    }
+ 
+ outWait:
+-   compat_finish_wait(listener->compat_sk_sleep, &wait, TASK_RUNNING);
++   compat_finish_wait(compat_sk_sleep(listener), &wait, TASK_RUNNING);
+ out:
+    release_sock(listener);
+    return err;
+@@ -3464,7 +3464,7 @@
+    sk = sock->sk;
+    vsk = vsock_sk(sk);
+ 
+-   poll_wait(file, sk->compat_sk_sleep, wait);
++   poll_wait(file, compat_sk_sleep(sk), wait);
+    mask = 0;
+ 
+    if (sk->compat_sk_err) {
+@@ -4104,7 +4104,7 @@
+       goto out;
+    }
+ 
+-   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;
+@@ -4141,7 +4141,7 @@
+             goto outWait;
+          }
+ 
+-         compat_cont_prepare_to_wait(sk->compat_sk_sleep,
++         compat_cont_prepare_to_wait(compat_sk_sleep(sk),
+                                      &wait, TASK_INTERRUPTIBLE);
+       }
+ 
+@@ -4194,7 +4194,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;
+@@ -4428,7 +4428,7 @@
+       goto out;
+    }
+ 
+-   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 = VSockVmciStreamHasData(vsk)) < target &&
+           sk->compat_sk_err == 0 &&
+@@ -4468,7 +4468,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) {
+@@ -4534,7 +4534,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/vmware-modules-1.0.0.24-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild
index 4a2895b8169d..830cb5ca72a6 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild,v 1.3 2010/02/26 14:54:32 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.24-r1.ebuild,v 1.4 2010/08/04 19:01:30 vadimk Exp $
 
 EAPI="2"
 
@@ -62,6 +62,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}-vmnet-2.6.31.patch"
 	epatch "${FILESDIR}/sched_h-2.6.32.patch"
 	epatch "${FILESDIR}/${PV}-autoconf-generated.patch"
+	kernel_is 2 6 35 && epatch "${FILESDIR}/${PV}-sk_sleep.patch"
 }
 
 src_install() {
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild
index d14da828ccb5..5e8e0a994d8f 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild,v 1.3 2010/05/03 16:53:39 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.25-r1.ebuild,v 1.4 2010/08/04 19:01:30 vadimk Exp $
 
 EAPI="2"
 
@@ -61,6 +61,9 @@ src_prepare() {
 	epatch "${FILESDIR}/sched_h-2.6.32.patch"
 	epatch "${FILESDIR}/${PV}-autoconf-generated.patch"
 	epatch "${FILESDIR}/apic.patch"
+	#kernel_is 2 6 35 && epatch "${FILESDIR}/iommu_map.patch"
+	kernel_is 2 6 35 && epatch "${FILESDIR}/${PV}-sk_sleep.patch"
+
 }
 
 src_install() {
diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild
index 3c3e6235b511..0435c38030f3 100644
--- a/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild,v 1.2 2010/05/03 16:53:39 vadimk Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.26.ebuild,v 1.3 2010/08/04 19:01:30 vadimk Exp $
 
 EAPI="2"
 
@@ -59,6 +59,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}-makefile-kernel-dir.patch"
 	epatch "${FILESDIR}/${PV}-makefile-include.patch"
 	epatch "${FILESDIR}/apic.patch"
+	kernel_is 2 6 35 && epatch "${FILESDIR}/${PV}-iommu_map.patch"
+	kernel_is 2 6 35 && epatch "${FILESDIR}/${PV}-sk_sleep.patch"
 }
 
 src_install() {