From: adilger <adilger>
Date: Tue, 3 Jun 2003 07:38:10 +0000 (+0000)
Subject: Add THREAD_NAME compat macro, to remove duplication of UML thread-name stuff.
X-Git-Tag: v1_7_110~1^13~194
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=5c5d4cab2117d23581bab8e6d57f45c44b188860;p=fs%2Flustre-release.git

Add THREAD_NAME compat macro, to remove duplication of UML thread-name stuff.
Make list_move() available if not defined (based on presence of
list_for_each_entry(), which is also defined in 2.5).
---

diff --git a/lnet/include/lnet/list.h b/lnet/include/lnet/list.h
index 2b63312..78a1e2d 100644
--- a/lnet/include/lnet/list.h
+++ b/lnet/include/lnet/list.h
@@ -1,6 +1,4 @@
 #ifndef _LINUX_LIST_H
-#define _LINUX_LIST_H
-
 
 /*
  * Simple doubly linked list implementation.
@@ -101,7 +99,9 @@ static inline void list_del_init(struct list_head *entry)
 	__list_del(entry->prev, entry->next);
 	INIT_LIST_HEAD(entry);
 }
+#endif
 
+#ifndef list_for_each_entry
 /**
  * list_move - delete from one list and add as another's head
  * @list: the entry to move
@@ -124,7 +124,10 @@ static inline void list_move_tail(struct list_head *list,
 	__list_del(list->prev, list->next);
 	list_add_tail(list, head);
 }
+#endif
 
+#ifndef _LINUX_LIST_H
+#define _LINUX_LIST_H
 /**
  * list_empty - tests whether a list is empty
  * @head: the list to test.
diff --git a/lustre/portals/include/portals/list.h b/lustre/portals/include/portals/list.h
index 2b63312..78a1e2d 100644
--- a/lustre/portals/include/portals/list.h
+++ b/lustre/portals/include/portals/list.h
@@ -1,6 +1,4 @@
 #ifndef _LINUX_LIST_H
-#define _LINUX_LIST_H
-
 
 /*
  * Simple doubly linked list implementation.
@@ -101,7 +99,9 @@ static inline void list_del_init(struct list_head *entry)
 	__list_del(entry->prev, entry->next);
 	INIT_LIST_HEAD(entry);
 }
+#endif
 
+#ifndef list_for_each_entry
 /**
  * list_move - delete from one list and add as another's head
  * @list: the entry to move
@@ -124,7 +124,10 @@ static inline void list_move_tail(struct list_head *list,
 	__list_del(list->prev, list->next);
 	list_add_tail(list, head);
 }
+#endif
 
+#ifndef _LINUX_LIST_H
+#define _LINUX_LIST_H
 /**
  * list_empty - tests whether a list is empty
  * @head: the list to test.