Get rid of compat_init.h

We are way past supporting kernels that did not have module_init()
or module_exit() so it is time to retire this compat header.

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>

diff --git a/open-vm-tools/modules/linux/shared/compat_init.h b/open-vm-tools/modules/linux/shared/compat_init.h
deleted file mode 100644 (file)
index 48d7075..0000000
--- a/open-vm-tools/modules/linux/shared/compat_init.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*********************************************************
- * Copyright (C) 1999 VMware, Inc. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation version 2 and no later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- *
- *********************************************************/
-
-/*
- * compat_init.h: Initialization compatibility wrappers.
- */
-
-#ifndef __COMPAT_INIT_H__
-#define __COMPAT_INIT_H__
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 2, 0)
-#include <linux/init.h>
-#endif
-
-#ifndef module_init
-#define module_init(x) int init_module(void)     { return x(); }
-#endif
-
-#ifndef module_exit
-#define module_exit(x) void cleanup_module(void) { x(); }
-#endif
-
-#endif /* __COMPAT_INIT_H__ */

diff --git a/open-vm-tools/modules/linux/vmci/linux/driver.c b/open-vm-tools/modules/linux/vmci/linux/driver.c
index 921f25c2d68839ca3d6697d0b088bb57d4a20c3c..4d8d7c29e50ffc9a78216e53710f72b68cc2f251 100644 (file)
--- a/open-vm-tools/modules/linux/vmci/linux/driver.c
+++ b/open-vm-tools/modules/linux/vmci/linux/driver.c
@@ -26,6 +26,7 @@
 
 #include <linux/file.h>
 #include <linux/fs.h>
+#include <linux/init.h>
 #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
 #   include <linux/ioctl32.h>
 /* Use weak: not all kernels export sys_ioctl for use by modules */
@@ -38,7 +39,6 @@ sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
 #include <linux/smp.h>
 
 #include "compat_highmem.h"
-#include "compat_init.h"
 #include "compat_interrupt.h"
 #include "compat_ioport.h"
 #include "compat_kernel.h"

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 3acd0365dd92f549328f056a4601e8bea68a3aaf..afcb75d7e9e07dc401993be43b5e0dc1936c7b13 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.3.0.0
-#define VMCI_DRIVER_VERSION_COMMAS   9,3,0,0
-#define VMCI_DRIVER_VERSION_STRING   "9.3.0.0"
+#define VMCI_DRIVER_VERSION          9.3.1.0
+#define VMCI_DRIVER_VERSION_COMMAS   9,3,1,0
+#define VMCI_DRIVER_VERSION_STRING   "9.3.1.0"
 
 #endif /* _VMCI_VERSION_H_ */

diff --git a/open-vm-tools/modules/linux/vmxnet/vmxnet.c b/open-vm-tools/modules/linux/vmxnet/vmxnet.c
index 80d2eabb61b8f27d9505a70fd52748c6df03a8f7..6ba1149a6ea080ab5060ceca71cd8dd5753a97fe 100644 (file)
--- a/open-vm-tools/modules/linux/vmxnet/vmxnet.c
+++ b/open-vm-tools/modules/linux/vmxnet/vmxnet.c
@@ -30,7 +30,6 @@
 #include "compat_spinlock.h"
 #include "compat_pci.h"
 #include "compat_pci_mapping.h"
-#include "compat_init.h"
 #include "compat_timer.h"
 #include "compat_ethtool.h"
 #include "compat_netdevice.h"
@@ -42,6 +41,8 @@
 #endif
 #include "compat_interrupt.h"
 
+#include <linux/init.h>
+
 #include <asm/page.h>
 #include <asm/uaccess.h>
 #include <asm/delay.h>

diff --git a/open-vm-tools/modules/linux/vmxnet/vmxnet_version.h b/open-vm-tools/modules/linux/vmxnet/vmxnet_version.h
index 522c46f8f58f49a5135513508466d32d7ae192a2..324dbb3f88aad4e75e346f1097f7a4de841541ff 100644 (file)
--- a/open-vm-tools/modules/linux/vmxnet/vmxnet_version.h
+++ b/open-vm-tools/modules/linux/vmxnet/vmxnet_version.h
@@ -25,8 +25,8 @@
 #ifndef _VMXNET_VERSION_H_
 #define _VMXNET_VERSION_H_
 
-#define VMXNET_DRIVER_VERSION          2.0.9.0
-#define VMXNET_DRIVER_VERSION_COMMAS   2,0,9,0
-#define VMXNET_DRIVER_VERSION_STRING   "2.0.9.0"
+#define VMXNET_DRIVER_VERSION          2.0.10.0
+#define VMXNET_DRIVER_VERSION_COMMAS   2,0,10,0
+#define VMXNET_DRIVER_VERSION_STRING   "2.0.10.0"
 
 #endif /* _VMXNET_VERSION_H_ */

diff --git a/open-vm-tools/modules/linux/vsock/linux/af_vsock.c b/open-vm-tools/modules/linux/vsock/linux/af_vsock.c
index e3b4c5e7500e5cb08bbe49c0b801e5654105989f..cc5390cb472ce42426a804d5cb9306ef2b4a9055 100644 (file)
--- a/open-vm-tools/modules/linux/vsock/linux/af_vsock.c
+++ b/open-vm-tools/modules/linux/vsock/linux/af_vsock.c
@@ -105,6 +105,7 @@
 #include <linux/bitops.h>
 #include <linux/list.h>
 #include <linux/wait.h>
+#include <linux/init.h>
 #include <asm/io.h>
 #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
 #   include <linux/ioctl32.h>
@@ -116,7 +117,6 @@ sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
 #include "compat_cred.h"
 #include "compat_module.h"
 #include "compat_kernel.h"
-#include "compat_init.h"
 #include "compat_sock.h"
 #include "compat_version.h"
 #include "compat_workqueue.h"

diff --git a/open-vm-tools/modules/linux/vsock/linux/vsock_version.h b/open-vm-tools/modules/linux/vsock/linux/vsock_version.h
index b786c7c173fbb27ff174e4de3c29df9c9de42dd5..77ffa25357e35eab0af29e6189e34e145d1d03be 100644 (file)
--- a/open-vm-tools/modules/linux/vsock/linux/vsock_version.h
+++ b/open-vm-tools/modules/linux/vsock/linux/vsock_version.h
@@ -25,8 +25,8 @@
 #ifndef _VSOCK_VERSION_H_
 #define _VSOCK_VERSION_H_
 
-#define VSOCK_DRIVER_VERSION          9.3.0.0
-#define VSOCK_DRIVER_VERSION_COMMAS   9,3,0,0
-#define VSOCK_DRIVER_VERSION_STRING   "9.3.0.0"
+#define VSOCK_DRIVER_VERSION          9.3.1.0
+#define VSOCK_DRIVER_VERSION_COMMAS   9,3,1,0
+#define VSOCK_DRIVER_VERSION_STRING   "9.3.1.0"
 
 #endif /* _VSOCK_VERSION_H_ */