Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 233677 Details for
Bug 322245
app-emulation/vmware-modules-1.0.0.2[4-6] doesn't compile with kernel >=2.6.34
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
1.0.0.26-sk_sleep.patch
1.0.0.26-sk_sleep.patch (text/plain), 4.48 KB, created by
Fabio Rossi
on 2010-05-31 14:47:34 UTC
(
hide
)
Description:
1.0.0.26-sk_sleep.patch
Filename:
MIME Type:
Creator:
Fabio Rossi
Created:
2010-05-31 14:47:34 UTC
Size:
4.48 KB
patch
obsolete
>--- vsock-only/linux/af_vsock.c.old 2010-05-31 16:27:02.580802672 +0200 >+++ vsock-only/linux/af_vsock.c 2010-05-31 16:28:36.567802987 +0200 >@@ -3221,7 +3221,11 @@ > * a notification of an error. > */ > timeout = sock_sndtimeo(sk, flags & O_NONBLOCK); >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) > compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); >+#else >+ compat_init_prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); >+#endif > > while (sk->compat_sk_state != SS_CONNECTED && sk->compat_sk_err == 0) { > if (timeout == 0) { >@@ -3244,7 +3248,11 @@ > goto outWaitError; > } > >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) > compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); >+#else >+ compat_cont_prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); >+#endif > } > > if (sk->compat_sk_err) { >@@ -3256,7 +3264,11 @@ > } > > outWait: >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) > compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING); >+#else >+ compat_finish_wait(sk_sleep(sk), &wait, TASK_RUNNING); >+#endif > out: > release_sock(sk); > return err; >@@ -3316,7 +3328,11 @@ > * upon connection establishment. > */ > timeout = sock_sndtimeo(listener, flags & O_NONBLOCK); >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) > compat_init_prepare_to_wait(listener->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); >+#else >+ compat_init_prepare_to_wait(sk_sleep(listener), &wait, TASK_INTERRUPTIBLE); >+#endif > > while ((connected = VSockVmciDequeueAccept(listener)) == NULL && > listener->compat_sk_err == 0) { >@@ -3332,7 +3348,11 @@ > goto outWait; > } > >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) > compat_cont_prepare_to_wait(listener->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); >+#else >+ compat_cont_prepare_to_wait(sk_sleep(listener), &wait, TASK_INTERRUPTIBLE); >+#endif > } > > if (listener->compat_sk_err) { >@@ -3366,7 +3386,11 @@ > } > > outWait: >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) > compat_finish_wait(listener->compat_sk_sleep, &wait, TASK_RUNNING); >+#else >+ compat_finish_wait(sk_sleep(listener), &wait, TASK_RUNNING); >+#endif > out: > release_sock(listener); > return err; >@@ -3464,7 +3488,11 @@ > sk = sock->sk; > vsk = vsock_sk(sk); > >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) > poll_wait(file, sk->compat_sk_sleep, wait); >+#else >+ poll_wait(file, sk_sleep(sk), wait); >+#endif > mask = 0; > > if (sk->compat_sk_err) { >@@ -4104,7 +4132,11 @@ > goto out; > } > >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) > compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); >+#else >+ compat_init_prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); >+#endif > > while (totalWritten < len) { > Bool sentWrote; >@@ -4141,8 +4173,13 @@ > goto outWait; > } > >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) > compat_cont_prepare_to_wait(sk->compat_sk_sleep, > &wait, TASK_INTERRUPTIBLE); >+#else >+ compat_cont_prepare_to_wait(sk_sleep(sk), >+ &wait, TASK_INTERRUPTIBLE); >+#endif > } > > /* >@@ -4194,7 +4231,11 @@ > if (totalWritten > 0) { > err = totalWritten; > } >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) > compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING); >+#else >+ compat_finish_wait(sk_sleep(sk), &wait, TASK_RUNNING); >+#endif > out: > release_sock(sk); > return err; >@@ -4428,7 +4469,11 @@ > goto out; > } > >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) > compat_init_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); >+#else >+ compat_init_prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); >+#endif > > while ((ready = VSockVmciStreamHasData(vsk)) < target && > sk->compat_sk_err == 0 && >@@ -4468,7 +4513,11 @@ > goto outWait; > } > >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) > compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE); >+#else >+ compat_cont_prepare_to_wait(sk_sleep(sk), &wait, TASK_INTERRUPTIBLE); >+#endif > } > > if (sk->compat_sk_err) { >@@ -4534,7 +4583,11 @@ > err = copied; > > outWait: >+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) > compat_finish_wait(sk->compat_sk_sleep, &wait, TASK_RUNNING); >+#else >+ compat_finish_wait(sk_sleep(sk), &wait, TASK_RUNNING); >+#endif > out: > release_sock(sk); > return err;
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 322245
:
233675
| 233677