* [gentoo-commits] gentoo-x86 commit in app-emulation/vmware-modules/files: 208-sema.patch 208-sk_sleep.patch 208-unlocked_ioctl.patch
@ 2011-03-27 15:40 Vadim Kuznetsov (vadimk)
0 siblings, 0 replies; 2+ messages in thread
From: Vadim Kuznetsov (vadimk) @ 2011-03-27 15:40 UTC (permalink / raw
To: gentoo-commits
vadimk 11/03/27 15:40:08
Added: 208-sema.patch 208-sk_sleep.patch
208-unlocked_ioctl.patch
Log:
vmware kernel modules for vmware server 2 host
(Portage version: 2.1.9.44/cvs/Linux x86_64)
Revision Changes Path
1.1 app-emulation/vmware-modules/files/208-sema.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/208-sema.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/208-sema.patch?rev=1.1&content-type=text/plain
Index: 208-sema.patch
===================================================================
diff -ru original//vmci-only/include/compat_semaphore.h patched//vmci-only/include/compat_semaphore.h
--- original//vmci-only/include/compat_semaphore.h 2010-11-11 15:37:25.000000000 -0500
+++ patched//vmci-only/include/compat_semaphore.h 2010-11-20 10:11:56.000000000 -0500
@@ -28,7 +28,7 @@
#endif
-#if defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
/*
* The -rt patch series changes the name of semaphore/mutex initialization
* routines (across the entire kernel). Probably to identify locations that
@@ -41,7 +41,7 @@
#define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m)
#endif
#ifndef init_MUTEX
- #define init_MUTEX(_m) semaphore_init(_m)
+ #define init_MUTEX(_m) sema_init(_m,1)
#endif
#endif
diff -ru original//vmmon-only/linux/driver.c patched//vmmon-only/linux/driver.c
--- original//vmmon-only/linux/driver.c 2010-11-11 15:37:22.000000000 -0500
+++ patched//vmmon-only/linux/driver.c 2010-11-29 23:09:16.000000000 -0500
@@ -145,7 +145,7 @@
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0) && \
(defined(CONFIG_SMP) || defined(CONFIG_PREEMPT))
-# define kernel_locked_by_current() kernel_locked()
+# define kernel_locked_by_current() (current->lock_depth >= 0)
#else
# define kernel_locked_by_current() 0
#endif
@@ -170,6 +170,7 @@
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 -ru original//vmnet-only/compat_semaphore.h patched//vmnet-only/compat_semaphore.h
--- original//vmnet-only/compat_semaphore.h 2010-11-11 15:37:23.000000000 -0500
+++ patched//vmnet-only/compat_semaphore.h 2010-11-20 10:11:56.000000000 -0500
@@ -28,7 +28,7 @@
#endif
-#if defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
/*
* The -rt patch series changes the name of semaphore/mutex initialization
* routines (across the entire kernel). Probably to identify locations that
@@ -41,7 +41,7 @@
#define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m)
#endif
#ifndef init_MUTEX
- #define init_MUTEX(_m) semaphore_init(_m)
+ #define init_MUTEX(_m) sema_init(_m,1)
#endif
#endif
diff -ru original//vsock-only/shared/compat_semaphore.h patched//vsock-only/shared/compat_semaphore.h
--- original//vsock-only/shared/compat_semaphore.h 2010-11-11 13:04:44.000000000 -0500
+++ patched//vsock-only/shared/compat_semaphore.h 2010-11-20 10:11:56.000000000 -0500
@@ -28,7 +28,7 @@
#endif
-#if defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)
+#if (defined CONFIG_PREEMPT_RT && LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 31)) || LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
/*
* The -rt patch series changes the name of semaphore/mutex initialization
* routines (across the entire kernel). Probably to identify locations that
@@ -41,7 +41,7 @@
#define DECLARE_MUTEX(_m) DEFINE_SEMAPHORE(_m)
#endif
#ifndef init_MUTEX
- #define init_MUTEX(_m) semaphore_init(_m)
+ #define init_MUTEX(_m) sema_init(_m,1)
#endif
#endif
1.1 app-emulation/vmware-modules/files/208-sk_sleep.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/208-sk_sleep.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/208-sk_sleep.patch?rev=1.1&content-type=text/plain
Index: 208-sk_sleep.patch
===================================================================
diff --git a/vsock-only/linux/af_vsock.c b/vsock-only/linux/af_vsock.c
index 314e5fb..bd69539 100644
--- a/vsock-only/linux/af_vsock.c
+++ b/vsock-only/linux/af_vsock.c
@@ -3150,5 +3150,5 @@ VSockVmciStreamConnect(struct socket *sock, // IN
*/
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) {
@@ -3173,5 +3173,5 @@ VSockVmciStreamConnect(struct socket *sock, // IN
}
- compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
+ compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
}
@@ -3185,5 +3185,5 @@ VSockVmciStreamConnect(struct socket *sock, // IN
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);
@@ -3392,5 +3392,5 @@ VSockVmciPoll(struct file *file, // IN
sk = sock->sk;
- poll_wait(file, sk->compat_sk_sleep, wait);
+ poll_wait(file, compat_sk_sleep(sk), wait);
mask = 0;
@@ -3993,5 +3993,5 @@ VSockVmciStreamSendmsg(struct kiocb *kiocb, // UNUSED
*/
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) {
@@ -4032,5 +4032,5 @@ VSockVmciStreamSendmsg(struct kiocb *kiocb, // UNUSED
}
- compat_cont_prepare_to_wait(sk->compat_sk_sleep,
+ compat_cont_prepare_to_wait(compat_sk_sleep(sk),
&wait, TASK_INTERRUPTIBLE);
}
@@ -4115,5 +4115,5 @@ outWait:
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);
@@ -4338,5 +4338,5 @@ VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED
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,
@@ -4381,5 +4381,5 @@ VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED
}
- compat_cont_prepare_to_wait(sk->compat_sk_sleep, &wait, TASK_INTERRUPTIBLE);
+ compat_cont_prepare_to_wait(compat_sk_sleep(sk), &wait, TASK_INTERRUPTIBLE);
}
@@ -4473,5 +4473,5 @@ VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED
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);
1.1 app-emulation/vmware-modules/files/208-unlocked_ioctl.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/208-unlocked_ioctl.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/vmware-modules/files/208-unlocked_ioctl.patch?rev=1.1&content-type=text/plain
Index: 208-unlocked_ioctl.patch
===================================================================
diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c
index bf93446..022e856 100644
--- a/vmmon-only/linux/driver.c
+++ b/vmmon-only/linux/driver.c
@@ -169,6 +169,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 8104878..02bb71c 100644
--- a/vmmon-only/linux/hostif.c
+++ b/vmmon-only/linux/hostif.c
@@ -3411,7 +3411,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 +3420,7 @@ HostIFDoIoctl(struct file *filp,
unlock_kernel();
return err;
}
+#endif
return -ENOIOCTLCMD;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/vmware-modules/files: 208-sema.patch 208-sk_sleep.patch 208-unlocked_ioctl.patch
@ 2011-10-19 17:17 Vadim Kuznetsov (vadimk)
0 siblings, 0 replies; 2+ messages in thread
From: Vadim Kuznetsov (vadimk) @ 2011-10-19 17:17 UTC (permalink / raw
To: gentoo-commits
vadimk 11/10/19 17:17:11
Removed: 208-sema.patch 208-sk_sleep.patch
208-unlocked_ioctl.patch
Log:
removed vmware-modules-208
(Portage version: 2.1.10.29/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-10-19 17:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-19 17:17 [gentoo-commits] gentoo-x86 commit in app-emulation/vmware-modules/files: 208-sema.patch 208-sk_sleep.patch 208-unlocked_ioctl.patch Vadim Kuznetsov (vadimk)
-- strict thread matches above, loose matches on Subject: below --
2011-03-27 15:40 Vadim Kuznetsov (vadimk)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox