VMCI: introduce compat_mod_param_bool

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>

diff --git a/open-vm-tools/modules/linux/shared/compat_module.h b/open-vm-tools/modules/linux/shared/compat_module.h
index 66fc469f8195e360d0fb5308b633e428d3726add..2af7372238b6f52a8aafdddcb427a466aac1c64f 100644 (file)
--- a/open-vm-tools/modules/linux/shared/compat_module.h
+++ b/open-vm-tools/modules/linux/shared/compat_module.h
@@ -69,4 +69,15 @@ static const char __module_cat(tag, __LINE__)[]                               \
 #define MODULE_VERSION(_version) MODULE_INFO(version, _version)
 #endif
 
+/*
+ * Linux kernel < 2.6.31 takes 'int' for 'bool' module parameters.
+ * Linux kernel >= 3.3.0 takes 'bool' for 'bool' module parameters.
+ * Kernels between the two take either.  So flip switch at 3.0.0.
+ */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)
+   typedef bool compat_mod_param_bool;
+#else
+   typedef int compat_mod_param_bool;
+#endif
+
 #endif /* __COMPAT_MODULE_H__ */

diff --git a/open-vm-tools/modules/linux/vmci/linux/driver.c b/open-vm-tools/modules/linux/vmci/linux/driver.c
index 79128dc7a17c01bdbbd8b7dd69918eeeb16bdadc..82738e43fe31792df7f83165c27d872acad10732 100644 (file)
--- a/open-vm-tools/modules/linux/vmci/linux/driver.c
+++ b/open-vm-tools/modules/linux/vmci/linux/driver.c
@@ -150,22 +150,11 @@ static void process_bitmap(unsigned long data);
 #  define VMCI_DISABLE_MSIX   1
 #endif
 
-/*
- * Linux kernel < 2.6.31 takes 'int' for 'bool' module parameters.
- * Linux kernel >= 3.3.0 takes 'bool' for 'bool' module parameters.
- * Kernels between the two take either.  So flip switch at 3.0.0.
- */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 0)
-   typedef bool compat_bool;
-#else
-   typedef int compat_bool;
-#endif
-
 static vmci_device vmci_dev;
-static compat_bool vmci_disable_host = 0;
-static compat_bool vmci_disable_guest = 0;
-static compat_bool vmci_disable_msi;
-static compat_bool vmci_disable_msix = VMCI_DISABLE_MSIX;
+static compat_mod_param_bool vmci_disable_host = 0;
+static compat_mod_param_bool vmci_disable_guest = 0;
+static compat_mod_param_bool vmci_disable_msi;
+static compat_mod_param_bool vmci_disable_msix = VMCI_DISABLE_MSIX;
 
 DECLARE_TASKLET(vmci_dg_tasklet, dispatch_datagrams,
                 (unsigned long)&vmci_dev);

diff --git a/open-vm-tools/modules/linux/vmci/linux/vmci_version.h b/open-vm-tools/modules/linux/vmci/linux/vmci_version.h
index dd53ab8f4d0f0e9edb557315bb71ab16d44a01cc..1d189b79cf2e050c1d05dd30ac27bcbb5fc06fcc 100644 (file)
--- a/open-vm-tools/modules/linux/vmci/linux/vmci_version.h
+++ b/open-vm-tools/modules/linux/vmci/linux/vmci_version.h
@@ -25,8 +25,8 @@
 #ifndef _VMCI_VERSION_H_
 #define _VMCI_VERSION_H_
 
-#define VMCI_DRIVER_VERSION          9.5.14.0
-#define VMCI_DRIVER_VERSION_COMMAS   9,5,14,0
-#define VMCI_DRIVER_VERSION_STRING   "9.5.14.0"
+#define VMCI_DRIVER_VERSION          9.5.15.0
+#define VMCI_DRIVER_VERSION_COMMAS   9,5,15,0
+#define VMCI_DRIVER_VERSION_STRING   "9.5.15.0"
 
 #endif /* _VMCI_VERSION_H_ */