1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
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;
}
|
GitWeb
