X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fportals%2Finclude%2Fportals%2Flist.h;fp=lustre%2Fportals%2Finclude%2Fportals%2Flist.h;h=78a1e2dd31bea8ac1be54cc9aac1636283cded3f;hb=a2a0746305449dbd925879b14dc2c0d6040bb8bf;hp=2b63312515b1c648f98c003a2fd71b2fa6a4521d;hpb=5cb9bb2f66ecb51fcffc988e18af5af69cf05b55;p=fs%2Flustre-release.git

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.