From: VMware, Inc <>
Date: Mon, 26 Jul 2010 18:24:08 +0000 (-0700)
Subject: Remove compat_list.h
X-Git-Tag: 2010.07.25-280253~85
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd7e997927f177f753f26e847a5b4aa7812dcfdc;p=thirdparty%2Fopen-vm-tools.git

Remove compat_list.h

Kernels 2.6.9 and newer have all required list handling routines.

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

diff --git a/open-vm-tools/modules/linux/shared/compat_list.h b/open-vm-tools/modules/linux/shared/compat_list.h
deleted file mode 100644
index 333557b5a..000000000
--- a/open-vm-tools/modules/linux/shared/compat_list.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*********************************************************
- * Copyright (C) 2006 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
- *
- *********************************************************/
-
-#ifndef __COMPAT_LIST_H__
-#   define __COMPAT_LIST_H__
-
-#include <linux/list.h>
-
-/*
- * list_add_tail is with us since 2.4.0, or something like that.
- */
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 4, 0)
-#define list_add_tail(newe, head) do {  \
-   struct list_head *__h = (head);      \
-   __list_add((newe), __h->prev, __h);  \
-} while (0)
-#endif
-
-/*
- * list_for_each_safe() showed up in 2.4.10, but it may be backported so we
- * just check for its existence.
- */
-#ifndef list_for_each_safe
-# define list_for_each_safe(pos, n, head) \
-         for (pos = (head)->next, n = pos->next; pos != (head); \
-                 pos = n, n = pos->next)
-#endif
-
-/*
- * list_for_each_entry() showed up in 2.4.20, but it may be backported so we
- * just check for its existence.
- */
-#ifndef list_for_each_entry
-# define list_for_each_entry(pos, head, member) \
-         for (pos = list_entry((head)->next, typeof(*pos), member); \
-              &pos->member != (head); \
-              pos = list_entry(pos->member.next, typeof(*pos), member))
-#endif
-
-#endif /* __COMPAT_LIST_H__ */
diff --git a/open-vm-tools/modules/linux/vmhgfs/transport.c b/open-vm-tools/modules/linux/vmhgfs/transport.c
index 728b95fc2..b52dc0468 100644
--- a/open-vm-tools/modules/linux/vmhgfs/transport.c
+++ b/open-vm-tools/modules/linux/vmhgfs/transport.c
@@ -33,7 +33,7 @@
 #include "driver-config.h"
 
 #include <linux/errno.h>
-#include "compat_list.h"
+#include <linux/list.h>
 #include "compat_mutex.h"
 #include "compat_sched.h"
 #include "compat_spinlock.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 214439639..a6a10a018 100644
--- a/open-vm-tools/modules/linux/vsock/linux/af_vsock.c
+++ b/open-vm-tools/modules/linux/vsock/linux/af_vsock.c
@@ -104,6 +104,7 @@
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
 #include <linux/bitops.h>
+#include <linux/list.h>
 #include <asm/io.h>
 #if defined(__x86_64__) && LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 12)
 #   include <linux/ioctl32.h>
@@ -119,7 +120,6 @@ sys_ioctl(unsigned int fd, unsigned int cmd, unsigned long arg);
 #include "compat_wait.h"
 #include "compat_version.h"
 #include "compat_workqueue.h"
-#include "compat_list.h"
 #include "compat_mutex.h"
 
 #include "vmware.h"
diff --git a/open-vm-tools/modules/linux/vsock/linux/util.c b/open-vm-tools/modules/linux/vsock/linux/util.c
index a776321ee..1e9fdea28 100644
--- a/open-vm-tools/modules/linux/vsock/linux/util.c
+++ b/open-vm-tools/modules/linux/vsock/linux/util.c
@@ -24,9 +24,9 @@
  */
 
 #include "driver-config.h"
+#include <linux/list.h>
 #include <linux/socket.h>
 #include "compat_sock.h"
-#include "compat_list.h"
 
 #include "af_vsock.h"
 #include "util.h"