diff options
| author |   Vadim Kuznetsov <vadimk@gentoo.org> | 2010-11-21 15:44:04 +0000 |
|---|---|---|
| committer | Vadim Kuznetsov <vadimk@gentoo.org> | 2010-11-21 15:44:04 +0000 |
| commit | 364ce8daa2ae3ec6b6c8d2e428fd91d65b26b26f (patch) | |
| tree | 27f63fa16b34c63a06ef8f7efeb2cc306a10037d /app-emulation/vmware-modules/files | |
| parent | sparc stable wrt #341175 (diff) | |
| download | gentoo-2-364ce8daa2ae3ec6b6c8d2e428fd91d65b26b26f.tar.gz gentoo-2-364ce8daa2ae3ec6b6c8d2e428fd91d65b26b26f.tar.bz2 gentoo-2-364ce8daa2ae3ec6b6c8d2e428fd91d65b26b26f.zip | |
updated unlocked_ioctl patch
(Portage version: 2.1.9.24/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/vmware-modules/files')
| -rw-r--r-- | app-emulation/vmware-modules/files/1.0.0.25-unlocked_ioctl.patch | 33 |
1 files changed, 33 insertions, 0 deletions
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 new file mode 100644 index 000000000000..f6250dc2e72f --- /dev/null +++ b/app-emulation/vmware-modules/files/1.0.0.25-unlocked_ioctl.patch @@ -0,0 +1,33 @@ +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; + } + |