[ltt-dev] [PATCH] tests: remove cds_ prefixes

[Paolo Bonzini]

These prefixes break compilation due to clashes with urcu/hlist.h.
Remove them from the private copies in tests (should be cleaned up,
though).

Signed-off-by: Paolo Bonzini <pbonzini at redhat.com>
---
 tests/api_gcc.h |  398 +++++++++++++++++++++++++++---------------------------
 tests/api_ppc.h |  398 +++++++++++++++++++++++++++---------------------------
 tests/api_x86.h |  398 +++++++++++++++++++++++++++---------------------------
 3 files changed, 597 insertions(+), 597 deletions(-)

diff --git a/tests/api_gcc.h b/tests/api_gcc.h
index 2db1ef2..632bdd5 100644
--- a/tests/api_gcc.h
+++ b/tests/api_gcc.h
@@ -656,16 +656,16 @@ static void smp_init(void)
  * using the generic single-entry routines.
  */
 
-struct cds_list_head {
-	struct cds_list_head *next, *prev;
+struct list_head {
+	struct list_head *next, *prev;
 };
 
-#define CDS_LIST_HEAD_INIT(name) { &(name), &(name) }
+#define LIST_HEAD_INIT(name) { &(name), &(name) }
 
-#define CDS_LIST_HEAD(name) \
-	struct cds_list_head name = CDS_LIST_HEAD_INIT(name)
+#define LIST_HEAD(name) \
+	struct list_head name = LIST_HEAD_INIT(name)
 
-static inline void CDS_INIT_LIST_HEAD(struct cds_list_head *list)
+static inline void INIT_LIST_HEAD(struct list_head *list)
 {
 	list->next = list;
 	list->prev = list;
@@ -678,9 +678,9 @@ static inline void CDS_INIT_LIST_HEAD(struct cds_list_head *list)
  * the prev/next entries already!
  */
 #ifndef CONFIG_DEBUG_LIST
-static inline void __cds_list_add(struct cds_list_head *new,
-			      struct cds_list_head *prev,
-			      struct cds_list_head *next)
+static inline void __list_add(struct list_head *new,
+			      struct list_head *prev,
+			      struct list_head *next)
 {
 	next->prev = new;
 	new->next = next;
@@ -688,36 +688,36 @@ static inline void __cds_list_add(struct cds_list_head *new,
 	prev->next = new;
 }
 #else
-extern void __cds_list_add(struct cds_list_head *new,
-			      struct cds_list_head *prev,
-			      struct cds_list_head *next);
+extern void __list_add(struct list_head *new,
+			      struct list_head *prev,
+			      struct list_head *next);
 #endif
 
 /**
- * cds_list_add - add a new entry
+ * list_add - add a new entry
  * @new: new entry to be added
  * @head: list head to add it after
  *
  * Insert a new entry after the specified head.
  * This is good for implementing stacks.
  */
-static inline void cds_list_add(struct cds_list_head *new, struct cds_list_head *head)
+static inline void list_add(struct list_head *new, struct list_head *head)
 {
-	__cds_list_add(new, head, head->next);
+	__list_add(new, head, head->next);
 }
 
 
 /**
- * cds_list_add_tail - add a new entry
+ * list_add_tail - add a new entry
  * @new: new entry to be added
  * @head: list head to add it before
  *
  * Insert a new entry before the specified head.
  * This is useful for implementing queues.
  */
-static inline void cds_list_add_tail(struct cds_list_head *new, struct cds_list_head *head)
+static inline void list_add_tail(struct list_head *new, struct list_head *head)
 {
-	__cds_list_add(new, head->prev, head);
+	__list_add(new, head->prev, head);
 }
 
 /*
@@ -727,38 +727,38 @@ static inline void cds_list_add_tail(struct cds_list_head *new, struct cds_list_
  * This is only for internal list manipulation where we know
  * the prev/next entries already!
  */
-static inline void __cds_list_del(struct cds_list_head * prev, struct cds_list_head * next)
+static inline void __list_del(struct list_head * prev, struct list_head * next)
 {
 	next->prev = prev;
 	prev->next = next;
 }
 
 /**
- * cds_list_del - deletes entry from list.
+ * list_del - deletes entry from list.
  * @entry: the element to delete from the list.
- * Note: cds_list_empty() on entry does not return true after this, the entry is
+ * Note: list_empty() on entry does not return true after this, the entry is
  * in an undefined state.
  */
 #ifndef CONFIG_DEBUG_LIST
-static inline void cds_list_del(struct cds_list_head *entry)
+static inline void list_del(struct list_head *entry)
 {
-	__cds_list_del(entry->prev, entry->next);
+	__list_del(entry->prev, entry->next);
 	entry->next = LIST_POISON1;
 	entry->prev = LIST_POISON2;
 }
 #else
-extern void cds_list_del(struct cds_list_head *entry);
+extern void list_del(struct list_head *entry);
 #endif
 
 /**
- * cds_list_replace - replace old entry by new one
+ * list_replace - replace old entry by new one
  * @old : the element to be replaced
  * @new : the new element to insert
  *
  * If @old was empty, it will be overwritten.
  */
-static inline void cds_list_replace(struct cds_list_head *old,
-				struct cds_list_head *new)
+static inline void list_replace(struct list_head *old,
+				struct list_head *new)
 {
 	new->next = old->next;
 	new->next->prev = new;
@@ -766,44 +766,44 @@ static inline void cds_list_replace(struct cds_list_head *old,
 	new->prev->next = new;
 }
 
-static inline void cds_list_replace_init(struct cds_list_head *old,
-					struct cds_list_head *new)
+static inline void list_replace_init(struct list_head *old,
+					struct list_head *new)
 {
-	cds_list_replace(old, new);
-	CDS_INIT_LIST_HEAD(old);
+	list_replace(old, new);
+	INIT_LIST_HEAD(old);
 }
 
 /**
- * cds_list_del_init - deletes entry from list and reinitialize it.
+ * list_del_init - deletes entry from list and reinitialize it.
  * @entry: the element to delete from the list.
  */
-static inline void cds_list_del_init(struct cds_list_head *entry)
+static inline void list_del_init(struct list_head *entry)
 {
-	__cds_list_del(entry->prev, entry->next);
-	CDS_INIT_LIST_HEAD(entry);
+	__list_del(entry->prev, entry->next);
+	INIT_LIST_HEAD(entry);
 }
 
 /**
- * cds_list_move - delete from one list and add as another's head
+ * list_move - delete from one list and add as another's head
  * @list: the entry to move
  * @head: the head that will precede our entry
  */
-static inline void cds_list_move(struct cds_list_head *list, struct cds_list_head *head)
+static inline void list_move(struct list_head *list, struct list_head *head)
 {
-	__cds_list_del(list->prev, list->next);
-	cds_list_add(list, head);
+	__list_del(list->prev, list->next);
+	list_add(list, head);
 }
 
 /**
- * cds_list_move_tail - delete from one list and add as another's tail
+ * list_move_tail - delete from one list and add as another's tail
  * @list: the entry to move
  * @head: the head that will follow our entry
  */
-static inline void cds_list_move_tail(struct cds_list_head *list,
-				  struct cds_list_head *head)
+static inline void list_move_tail(struct list_head *list,
+				  struct list_head *head)
 {
-	__cds_list_del(list->prev, list->next);
-	cds_list_add_tail(list, head);
+	__list_del(list->prev, list->next);
+	list_add_tail(list, head);
 }
 
 /**
@@ -811,37 +811,37 @@ static inline void cds_list_move_tail(struct cds_list_head *list,
  * @list: the entry to test
  * @head: the head of the list
  */
-static inline int list_is_last(const struct cds_list_head *list,
-				const struct cds_list_head *head)
+static inline int list_is_last(const struct list_head *list,
+				const struct list_head *head)
 {
 	return list->next == head;
 }
 
 /**
- * cds_list_empty - tests whether a list is empty
+ * list_empty - tests whether a list is empty
  * @head: the list to test.
  */
-static inline int cds_list_empty(const struct cds_list_head *head)
+static inline int list_empty(const struct list_head *head)
 {
 	return head->next == head;
 }
 
 /**
- * cds_list_empty_careful - tests whether a list is empty and not being modified
+ * list_empty_careful - tests whether a list is empty and not being modified
  * @head: the list to test
  *
  * Description:
  * tests whether a list is empty _and_ checks that no other CPU might be
  * in the process of modifying either member (next or prev)
  *
- * NOTE: using cds_list_empty_careful() without synchronization
+ * NOTE: using list_empty_careful() without synchronization
  * can only be safe if the only activity that can happen
- * to the list entry is cds_list_del_init(). Eg. it cannot be used
+ * to the list entry is list_del_init(). Eg. it cannot be used
  * if another CPU could re-list_add() it.
  */
-static inline int cds_list_empty_careful(const struct cds_list_head *head)
+static inline int list_empty_careful(const struct list_head *head)
 {
-	struct cds_list_head *next = head->next;
+	struct list_head *next = head->next;
 	return (next == head) && (next == head->prev);
 }
 
@@ -849,15 +849,15 @@ static inline int cds_list_empty_careful(const struct cds_list_head *head)
  * list_is_singular - tests whether a list has just one entry.
  * @head: the list to test.
  */
-static inline int list_is_singular(const struct cds_list_head *head)
+static inline int list_is_singular(const struct list_head *head)
 {
 	return !list_empty(head) && (head->next == head->prev);
 }
 
-static inline void __list_cut_position(struct cds_list_head *list,
-		struct cds_list_head *head, struct cds_list_head *entry)
+static inline void __list_cut_position(struct list_head *list,
+		struct list_head *head, struct list_head *entry)
 {
-	struct cds_list_head *new_first = entry->next;
+	struct list_head *new_first = entry->next;
 	list->next = head->next;
 	list->next->prev = list;
 	list->prev = entry;
@@ -880,26 +880,26 @@ static inline void __list_cut_position(struct cds_list_head *list,
  * losing its data.
  *
  */
-static inline void list_cut_position(struct cds_list_head *list,
-		struct cds_list_head *head, struct cds_list_head *entry)
+static inline void list_cut_position(struct list_head *list,
+		struct list_head *head, struct list_head *entry)
 {
-	if (cds_list_empty(head))
+	if (list_empty(head))
 		return;
 	if (list_is_singular(head) &&
 		(head->next != entry && head != entry))
 		return;
 	if (entry == head)
-		CDS_INIT_LIST_HEAD(list);
+		INIT_LIST_HEAD(list);
 	else
 		__list_cut_position(list, head, entry);
 }
 
-static inline void __cds_list_splice(const struct cds_list_head *list,
-				 struct cds_list_head *prev,
-				 struct cds_list_head *next)
+static inline void __list_splice(const struct list_head *list,
+				 struct list_head *prev,
+				 struct list_head *next)
 {
-	struct cds_list_head *first = list->next;
-	struct cds_list_head *last = list->prev;
+	struct list_head *first = list->next;
+	struct list_head *last = list->prev;
 
 	first->prev = prev;
 	prev->next = first;
@@ -909,69 +909,69 @@ static inline void __cds_list_splice(const struct cds_list_head *list,
 }
 
 /**
- * cds_list_splice - join two lists, this is designed for stacks
+ * list_splice - join two lists, this is designed for stacks
  * @list: the new list to add.
  * @head: the place to add it in the first list.
  */
-static inline void cds_list_splice(const struct cds_list_head *list,
-				struct cds_list_head *head)
+static inline void list_splice(const struct list_head *list,
+				struct list_head *head)
 {
-	if (!cds_list_empty(list))
-		__cds_list_splice(list, head, head->next);
+	if (!list_empty(list))
+		__list_splice(list, head, head->next);
 }
 
 /**
- * cds_list_splice_tail - join two lists, each list being a queue
+ * list_splice_tail - join two lists, each list being a queue
  * @list: the new list to add.
  * @head: the place to add it in the first list.
  */
-static inline void cds_list_splice_tail(struct cds_list_head *list,
-				struct cds_list_head *head)
+static inline void list_splice_tail(struct list_head *list,
+				struct list_head *head)
 {
-	if (!cds_list_empty(list))
-		__cds_list_splice(list, head->prev, head);
+	if (!list_empty(list))
+		__list_splice(list, head->prev, head);
 }
 
 /**
- * cds_list_splice_init - join two lists and reinitialise the emptied list.
+ * list_splice_init - join two lists and reinitialise the emptied list.
  * @list: the new list to add.
  * @head: the place to add it in the first list.
  *
  * The list at @list is reinitialised
  */
-static inline void cds_list_splice_init(struct cds_list_head *list,
-				    struct cds_list_head *head)
+static inline void list_splice_init(struct list_head *list,
+				    struct list_head *head)
 {
-	if (!cds_list_empty(list)) {
-		__cds_list_splice(list, head, head->next);
-		CDS_INIT_LIST_HEAD(list);
+	if (!list_empty(list)) {
+		__list_splice(list, head, head->next);
+		INIT_LIST_HEAD(list);
 	}
 }
 
 /**
- * cds_list_splice_tail_init - join two lists and reinitialise the emptied list
+ * list_splice_tail_init - join two lists and reinitialise the emptied list
  * @list: the new list to add.
  * @head: the place to add it in the first list.
  *
  * Each of the lists is a queue.
  * The list at @list is reinitialised
  */
-static inline void cds_list_splice_tail_init(struct cds_list_head *list,
-					 struct cds_list_head *head)
+static inline void list_splice_tail_init(struct list_head *list,
+					 struct list_head *head)
 {
-	if (!cds_list_empty(list)) {
-		__cds_list_splice(list, head->prev, head);
-		CDS_INIT_LIST_HEAD(list);
+	if (!list_empty(list)) {
+		__list_splice(list, head->prev, head);
+		INIT_LIST_HEAD(list);
 	}
 }
 
 /**
- * cds_list_entry - get the struct for this entry
- * @ptr:	the &struct cds_list_head pointer.
+ * list_entry - get the struct for this entry
+ * @ptr:	the &struct list_head pointer.
  * @type:	the type of the struct this is embedded in.
  * @member:	the name of the list_struct within the struct.
  */
-#define cds_list_entry(ptr, type, member) \
+#define list_entry(ptr, type, member) \
 	caa_container_of(ptr, type, member)
 
 /**
@@ -983,95 +983,95 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Note, that list is expected to be not empty.
  */
 #define list_first_entry(ptr, type, member) \
-	cds_list_entry((ptr)->next, type, member)
+	list_entry((ptr)->next, type, member)
 
 /**
- * cds_list_for_each	-	iterate over a list
- * @pos:	the &struct cds_list_head to use as a loop cursor.
+ * list_for_each	-	iterate over a list
+ * @pos:	the &struct list_head to use as a loop cursor.
  * @head:	the head for your list.
  */
-#define cds_list_for_each(pos, head) \
+#define list_for_each(pos, head) \
 	for (pos = (head)->next; prefetch(pos->next), pos != (head); \
         	pos = pos->next)
 
 /**
- * __cds_list_for_each	-	iterate over a list
- * @pos:	the &struct cds_list_head to use as a loop cursor.
+ * __list_for_each	-	iterate over a list
+ * @pos:	the &struct list_head to use as a loop cursor.
  * @head:	the head for your list.
  *
- * This variant differs from cds_list_for_each() in that it's the
+ * This variant differs from list_for_each() in that it's the
  * simplest possible list iteration code, no prefetching is done.
  * Use this for code that knows the list to be very short (empty
  * or 1 entry) most of the time.
  */
-#define __cds_list_for_each(pos, head) \
+#define __list_for_each(pos, head) \
 	for (pos = (head)->next; pos != (head); pos = pos->next)
 
 /**
- * cds_list_for_each_prev	-	iterate over a list backwards
- * @pos:	the &struct cds_list_head to use as a loop cursor.
+ * list_for_each_prev	-	iterate over a list backwards
+ * @pos:	the &struct list_head to use as a loop cursor.
  * @head:	the head for your list.
  */
-#define cds_list_for_each_prev(pos, head) \
+#define list_for_each_prev(pos, head) \
 	for (pos = (head)->prev; prefetch(pos->prev), pos != (head); \
         	pos = pos->prev)
 
 /**
- * cds_list_for_each_safe - iterate over a list safe against removal of list entry
- * @pos:	the &struct cds_list_head to use as a loop cursor.
- * @n:		another &struct cds_list_head to use as temporary storage
+ * list_for_each_safe - iterate over a list safe against removal of list entry
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @n:		another &struct list_head to use as temporary storage
  * @head:	the head for your list.
  */
-#define cds_list_for_each_safe(pos, n, head) \
+#define list_for_each_safe(pos, n, head) \
 	for (pos = (head)->next, n = pos->next; pos != (head); \
 		pos = n, n = pos->next)
 
 /**
- * cds_list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry
- * @pos:	the &struct cds_list_head to use as a loop cursor.
- * @n:		another &struct cds_list_head to use as temporary storage
+ * list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @n:		another &struct list_head to use as temporary storage
  * @head:	the head for your list.
  */
-#define cds_list_for_each_prev_safe(pos, n, head) \
+#define list_for_each_prev_safe(pos, n, head) \
 	for (pos = (head)->prev, n = pos->prev; \
 	     prefetch(pos->prev), pos != (head); \
 	     pos = n, n = pos->prev)
 
 /**
- * cds_list_for_each_entry	-	iterate over list of given type
+ * list_for_each_entry	-	iterate over list of given type
  * @pos:	the type * to use as a loop cursor.
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
  */
-#define cds_list_for_each_entry(pos, head, member)				\
-	for (pos = cds_list_entry((head)->next, typeof(*pos), member);	\
+#define list_for_each_entry(pos, head, member)				\
+	for (pos = list_entry((head)->next, typeof(*pos), member);	\
 	     prefetch(pos->member.next), &pos->member != (head); 	\
-	     pos = cds_list_entry(pos->member.next, typeof(*pos), member))
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
 
 /**
- * cds_list_for_each_entry_reverse - iterate backwards over list of given type.
+ * list_for_each_entry_reverse - iterate backwards over list of given type.
  * @pos:	the type * to use as a loop cursor.
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
  */
-#define cds_list_for_each_entry_reverse(pos, head, member)			\
-	for (pos = cds_list_entry((head)->prev, typeof(*pos), member);	\
+#define list_for_each_entry_reverse(pos, head, member)			\
+	for (pos = list_entry((head)->prev, typeof(*pos), member);	\
 	     prefetch(pos->member.prev), &pos->member != (head); 	\
-	     pos = cds_list_entry(pos->member.prev, typeof(*pos), member))
+	     pos = list_entry(pos->member.prev, typeof(*pos), member))
 
 /**
- * list_prepare_entry - prepare a pos entry for use in cds_list_for_each_entry_continue()
+ * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue()
  * @pos:	the type * to use as a start point
  * @head:	the head of the list
  * @member:	the name of the list_struct within the struct.
  *
- * Prepares a pos entry for use as a start point in cds_list_for_each_entry_continue().
+ * Prepares a pos entry for use as a start point in list_for_each_entry_continue().
  */
 #define list_prepare_entry(pos, head, member) \
-	((pos) ? : cds_list_entry(head, typeof(*pos), member))
+	((pos) ? : list_entry(head, typeof(*pos), member))
 
 /**
- * cds_list_for_each_entry_continue - continue iteration over list of given type
+ * list_for_each_entry_continue - continue iteration over list of given type
  * @pos:	the type * to use as a loop cursor.
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
@@ -1079,13 +1079,13 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Continue to iterate over list of given type, continuing after
  * the current position.
  */
-#define cds_list_for_each_entry_continue(pos, head, member) 		\
-	for (pos = cds_list_entry(pos->member.next, typeof(*pos), member);	\
+#define list_for_each_entry_continue(pos, head, member) 		\
+	for (pos = list_entry(pos->member.next, typeof(*pos), member);	\
 	     prefetch(pos->member.next), &pos->member != (head);	\
-	     pos = cds_list_entry(pos->member.next, typeof(*pos), member))
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
 
 /**
- * cds_list_for_each_entry_continue_reverse - iterate backwards from the given point
+ * list_for_each_entry_continue_reverse - iterate backwards from the given point
  * @pos:	the type * to use as a loop cursor.
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
@@ -1093,38 +1093,38 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Start to iterate over list of given type backwards, continuing after
  * the current position.
  */
-#define cds_list_for_each_entry_continue_reverse(pos, head, member)		\
-	for (pos = cds_list_entry(pos->member.prev, typeof(*pos), member);	\
+#define list_for_each_entry_continue_reverse(pos, head, member)		\
+	for (pos = list_entry(pos->member.prev, typeof(*pos), member);	\
 	     prefetch(pos->member.prev), &pos->member != (head);	\
-	     pos = cds_list_entry(pos->member.prev, typeof(*pos), member))
+	     pos = list_entry(pos->member.prev, typeof(*pos), member))
 
 /**
- * cds_list_for_each_entry_from - iterate over list of given type from the current point
+ * list_for_each_entry_from - iterate over list of given type from the current point
  * @pos:	the type * to use as a loop cursor.
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
  *
  * Iterate over list of given type, continuing from current position.
  */
-#define cds_list_for_each_entry_from(pos, head, member) 			\
+#define list_for_each_entry_from(pos, head, member) 			\
 	for (; prefetch(pos->member.next), &pos->member != (head);	\
-	     pos = cds_list_entry(pos->member.next, typeof(*pos), member))
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
 
 /**
- * cds_list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
  * @pos:	the type * to use as a loop cursor.
  * @n:		another type * to use as temporary storage
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
  */
-#define cds_list_for_each_entry_safe(pos, n, head, member)			\
-	for (pos = cds_list_entry((head)->next, typeof(*pos), member),	\
-		n = cds_list_entry(pos->member.next, typeof(*pos), member);	\
+#define list_for_each_entry_safe(pos, n, head, member)			\
+	for (pos = list_entry((head)->next, typeof(*pos), member),	\
+		n = list_entry(pos->member.next, typeof(*pos), member);	\
 	     &pos->member != (head); 					\
-	     pos = n, n = cds_list_entry(n->member.next, typeof(*n), member))
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
 
 /**
- * cds_list_for_each_entry_safe_continue
+ * list_for_each_entry_safe_continue
  * @pos:	the type * to use as a loop cursor.
  * @n:		another type * to use as temporary storage
  * @head:	the head for your list.
@@ -1133,14 +1133,14 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Iterate over list of given type, continuing after current point,
  * safe against removal of list entry.
  */
-#define cds_list_for_each_entry_safe_continue(pos, n, head, member) 		\
-	for (pos = cds_list_entry(pos->member.next, typeof(*pos), member), 		\
-		n = cds_list_entry(pos->member.next, typeof(*pos), member);		\
+#define list_for_each_entry_safe_continue(pos, n, head, member) 		\
+	for (pos = list_entry(pos->member.next, typeof(*pos), member), 		\
+		n = list_entry(pos->member.next, typeof(*pos), member);		\
 	     &pos->member != (head);						\
-	     pos = n, n = cds_list_entry(n->member.next, typeof(*n), member))
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
 
 /**
- * cds_list_for_each_entry_safe_from
+ * list_for_each_entry_safe_from
  * @pos:	the type * to use as a loop cursor.
  * @n:		another type * to use as temporary storage
  * @head:	the head for your list.
@@ -1149,13 +1149,13 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Iterate over list of given type from current point, safe against
  * removal of list entry.
  */
-#define cds_list_for_each_entry_safe_from(pos, n, head, member) 			\
-	for (n = cds_list_entry(pos->member.next, typeof(*pos), member);		\
+#define list_for_each_entry_safe_from(pos, n, head, member) 			\
+	for (n = list_entry(pos->member.next, typeof(*pos), member);		\
 	     &pos->member != (head);						\
-	     pos = n, n = cds_list_entry(n->member.next, typeof(*n), member))
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
 
 /**
- * cds_list_for_each_entry_safe_reverse
+ * list_for_each_entry_safe_reverse
  * @pos:	the type * to use as a loop cursor.
  * @n:		another type * to use as temporary storage
  * @head:	the head for your list.
@@ -1164,11 +1164,11 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Iterate backwards over list of given type, safe against removal
  * of list entry.
  */
-#define cds_list_for_each_entry_safe_reverse(pos, n, head, member)		\
-	for (pos = cds_list_entry((head)->prev, typeof(*pos), member),	\
-		n = cds_list_entry(pos->member.prev, typeof(*pos), member);	\
+#define list_for_each_entry_safe_reverse(pos, n, head, member)		\
+	for (pos = list_entry((head)->prev, typeof(*pos), member),	\
+		n = list_entry(pos->member.prev, typeof(*pos), member);	\
 	     &pos->member != (head); 					\
-	     pos = n, n = cds_list_entry(n->member.prev, typeof(*n), member))
+	     pos = n, n = list_entry(n->member.prev, typeof(*n), member))
 
 #endif //0
 
@@ -1179,60 +1179,60 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * You lose the ability to access the tail in O(1).
  */
 
-struct cds_hlist_head {
-	struct cds_hlist_node *first;
+struct hlist_head {
+	struct hlist_node *first;
 };
 
-struct cds_hlist_node {
-	struct cds_hlist_node *next, **pprev;
+struct hlist_node {
+	struct hlist_node *next, **pprev;
 };
 
 #define HLIST_HEAD_INIT { .first = NULL }
-#define HLIST_HEAD(name) struct cds_hlist_head name = {  .first = NULL }
-#define CDS_INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
-static inline void INIT_HLIST_NODE(struct cds_hlist_node *h)
+#define HLIST_HEAD(name) struct hlist_head name = {  .first = NULL }
+#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
+static inline void INIT_HLIST_NODE(struct hlist_node *h)
 {
 	h->next = NULL;
 	h->pprev = NULL;
 }
 
-static inline int hlist_unhashed(const struct cds_hlist_node *h)
+static inline int hlist_unhashed(const struct hlist_node *h)
 {
 	return !h->pprev;
 }
 
-static inline int hlist_empty(const struct cds_hlist_head *h)
+static inline int hlist_empty(const struct hlist_head *h)
 {
 	return !h->first;
 }
 
-static inline void __cds_hlist_del(struct cds_hlist_node *n)
+static inline void __hlist_del(struct hlist_node *n)
 {
-	struct cds_hlist_node *next = n->next;
-	struct cds_hlist_node **pprev = n->pprev;
+	struct hlist_node *next = n->next;
+	struct hlist_node **pprev = n->pprev;
 	*pprev = next;
 	if (next)
 		next->pprev = pprev;
 }
 
-static inline void cds_hlist_del(struct cds_hlist_node *n)
+static inline void hlist_del(struct hlist_node *n)
 {
-	__cds_hlist_del(n);
+	__hlist_del(n);
 	n->next = LIST_POISON1;
 	n->pprev = LIST_POISON2;
 }
 
-static inline void cds_hlist_del_init(struct cds_hlist_node *n)
+static inline void hlist_del_init(struct hlist_node *n)
 {
 	if (!hlist_unhashed(n)) {
-		__cds_hlist_del(n);
+		__hlist_del(n);
 		INIT_HLIST_NODE(n);
 	}
 }
 
-static inline void cds_hlist_add_head(struct cds_hlist_node *n, struct cds_hlist_head *h)
+static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
 {
-	struct cds_hlist_node *first = h->first;
+	struct hlist_node *first = h->first;
 	n->next = first;
 	if (first)
 		first->pprev = &n->next;
@@ -1241,8 +1241,8 @@ static inline void cds_hlist_add_head(struct cds_hlist_node *n, struct cds_hlist
 }
 
 /* next must be != NULL */
-static inline void hlist_add_before(struct cds_hlist_node *n,
-					struct cds_hlist_node *next)
+static inline void hlist_add_before(struct hlist_node *n,
+					struct hlist_node *next)
 {
 	n->pprev = next->pprev;
 	n->next = next;
@@ -1250,8 +1250,8 @@ static inline void hlist_add_before(struct cds_hlist_node *n,
 	*(n->pprev) = n;
 }
 
-static inline void hlist_add_after(struct cds_hlist_node *n,
-					struct cds_hlist_node *next)
+static inline void hlist_add_after(struct hlist_node *n,
+					struct hlist_node *next)
 {
 	next->next = n->next;
 	n->next = next;
@@ -1265,8 +1265,8 @@ static inline void hlist_add_after(struct cds_hlist_node *n,
  * Move a list from one list head to another. Fixup the pprev
  * reference of the first entry if it exists.
  */
-static inline void hlist_move_list(struct cds_hlist_head *old,
-				   struct cds_hlist_head *new)
+static inline void hlist_move_list(struct hlist_head *old,
+				   struct hlist_head *new)
 {
 	new->first = old->first;
 	if (new->first)
@@ -1274,64 +1274,64 @@ static inline void hlist_move_list(struct cds_hlist_head *old,
 	old->first = NULL;
 }
 
-#define cds_hlist_entry(ptr, type, member) caa_container_of(ptr,type,member)
+#define hlist_entry(ptr, type, member) caa_container_of(ptr,type,member)
 
-#define cds_hlist_for_each(pos, head) \
+#define hlist_for_each(pos, head) \
 	for (pos = (head)->first; pos && ({ prefetch(pos->next); 1; }); \
 	     pos = pos->next)
 
-#define cds_hlist_for_each_safe(pos, n, head) \
+#define hlist_for_each_safe(pos, n, head) \
 	for (pos = (head)->first; pos && ({ n = pos->next; 1; }); \
 	     pos = n)
 
 /**
- * cds_hlist_for_each_entry	- iterate over list of given type
+ * hlist_for_each_entry	- iterate over list of given type
  * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct cds_hlist_node to use as a loop cursor.
+ * @pos:	the &struct hlist_node to use as a loop cursor.
  * @head:	the head for your list.
- * @member:	the name of the cds_hlist_node within the struct.
+ * @member:	the name of the hlist_node within the struct.
  */
-#define cds_hlist_for_each_entry(tpos, pos, head, member)			 \
+#define hlist_for_each_entry(tpos, pos, head, member)			 \
 	for (pos = (head)->first;					 \
 	     pos && ({ prefetch(pos->next); 1;}) &&			 \
-		({ tpos = cds_hlist_entry(pos, typeof(*tpos), member); 1;}); \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
 	     pos = pos->next)
 
 /**
- * cds_hlist_for_each_entry_continue - iterate over a hlist continuing after current point
+ * hlist_for_each_entry_continue - iterate over a hlist continuing after current point
  * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct cds_hlist_node to use as a loop cursor.
- * @member:	the name of the cds_hlist_node within the struct.
+ * @pos:	the &struct hlist_node to use as a loop cursor.
+ * @member:	the name of the hlist_node within the struct.
  */
-#define cds_hlist_for_each_entry_continue(tpos, pos, member)		 \
+#define hlist_for_each_entry_continue(tpos, pos, member)		 \
 	for (pos = (pos)->next;						 \
 	     pos && ({ prefetch(pos->next); 1;}) &&			 \
-		({ tpos = cds_hlist_entry(pos, typeof(*tpos), member); 1;}); \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
 	     pos = pos->next)
 
 /**
- * cds_hlist_for_each_entry_from - iterate over a hlist continuing from current point
+ * hlist_for_each_entry_from - iterate over a hlist continuing from current point
  * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct cds_hlist_node to use as a loop cursor.
- * @member:	the name of the cds_hlist_node within the struct.
+ * @pos:	the &struct hlist_node to use as a loop cursor.
+ * @member:	the name of the hlist_node within the struct.
  */
-#define cds_hlist_for_each_entry_from(tpos, pos, member)			 \
+#define hlist_for_each_entry_from(tpos, pos, member)			 \
 	for (; pos && ({ prefetch(pos->next); 1;}) &&			 \
-		({ tpos = cds_hlist_entry(pos, typeof(*tpos), member); 1;}); \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
 	     pos = pos->next)
 
 /**
- * cds_hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
  * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct cds_hlist_node to use as a loop cursor.
- * @n:		another &struct cds_hlist_node to use as temporary storage
+ * @pos:	the &struct hlist_node to use as a loop cursor.
+ * @n:		another &struct hlist_node to use as temporary storage
  * @head:	the head for your list.
- * @member:	the name of the cds_hlist_node within the struct.
+ * @member:	the name of the hlist_node within the struct.
  */
-#define cds_hlist_for_each_entry_safe(tpos, pos, n, head, member) 		 \
+#define hlist_for_each_entry_safe(tpos, pos, n, head, member) 		 \
 	for (pos = (head)->first;					 \
 	     pos && ({ n = pos->next; 1; }) && 				 \
-		({ tpos = cds_hlist_entry(pos, typeof(*tpos), member); 1;}); \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
 	     pos = n)
 
 #endif
diff --git a/tests/api_ppc.h b/tests/api_ppc.h
index 038c9cb..5c5f6e9 100644
--- a/tests/api_ppc.h
+++ b/tests/api_ppc.h
@@ -1015,16 +1015,16 @@ static void smp_init(void)
  * using the generic single-entry routines.
  */
 
-struct cds_list_head {
-	struct cds_list_head *next, *prev;
+struct list_head {
+	struct list_head *next, *prev;
 };
 
-#define CDS_LIST_HEAD_INIT(name) { &(name), &(name) }
+#define LIST_HEAD_INIT(name) { &(name), &(name) }
 
-#define CDS_LIST_HEAD(name) \
-	struct cds_list_head name = CDS_LIST_HEAD_INIT(name)
+#define LIST_HEAD(name) \
+	struct list_head name = LIST_HEAD_INIT(name)
 
-static inline void CDS_INIT_LIST_HEAD(struct cds_list_head *list)
+static inline void INIT_LIST_HEAD(struct list_head *list)
 {
 	list->next = list;
 	list->prev = list;
@@ -1037,9 +1037,9 @@ static inline void CDS_INIT_LIST_HEAD(struct cds_list_head *list)
  * the prev/next entries already!
  */
 #ifndef CONFIG_DEBUG_LIST
-static inline void __cds_list_add(struct cds_list_head *new,
-			      struct cds_list_head *prev,
-			      struct cds_list_head *next)
+static inline void __list_add(struct list_head *new,
+			      struct list_head *prev,
+			      struct list_head *next)
 {
 	next->prev = new;
 	new->next = next;
@@ -1047,36 +1047,36 @@ static inline void __cds_list_add(struct cds_list_head *new,
 	prev->next = new;
 }
 #else
-extern void __cds_list_add(struct cds_list_head *new,
-			      struct cds_list_head *prev,
-			      struct cds_list_head *next);
+extern void __list_add(struct list_head *new,
+			      struct list_head *prev,
+			      struct list_head *next);
 #endif
 
 /**
- * cds_list_add - add a new entry
+ * list_add - add a new entry
  * @new: new entry to be added
  * @head: list head to add it after
  *
  * Insert a new entry after the specified head.
  * This is good for implementing stacks.
  */
-static inline void cds_list_add(struct cds_list_head *new, struct cds_list_head *head)
+static inline void list_add(struct list_head *new, struct list_head *head)
 {
-	__cds_list_add(new, head, head->next);
+	__list_add(new, head, head->next);
 }
 
 
 /**
- * cds_list_add_tail - add a new entry
+ * list_add_tail - add a new entry
  * @new: new entry to be added
  * @head: list head to add it before
  *
  * Insert a new entry before the specified head.
  * This is useful for implementing queues.
  */
-static inline void cds_list_add_tail(struct cds_list_head *new, struct cds_list_head *head)
+static inline void list_add_tail(struct list_head *new, struct list_head *head)
 {
-	__cds_list_add(new, head->prev, head);
+	__list_add(new, head->prev, head);
 }
 
 /*
@@ -1086,38 +1086,38 @@ static inline void cds_list_add_tail(struct cds_list_head *new, struct cds_list_
  * This is only for internal list manipulation where we know
  * the prev/next entries already!
  */
-static inline void __cds_list_del(struct cds_list_head * prev, struct cds_list_head * next)
+static inline void __list_del(struct list_head * prev, struct list_head * next)
 {
 	next->prev = prev;
 	prev->next = next;
 }
 
 /**
- * cds_list_del - deletes entry from list.
+ * list_del - deletes entry from list.
  * @entry: the element to delete from the list.
- * Note: cds_list_empty() on entry does not return true after this, the entry is
+ * Note: list_empty() on entry does not return true after this, the entry is
  * in an undefined state.
  */
 #ifndef CONFIG_DEBUG_LIST
-static inline void cds_list_del(struct cds_list_head *entry)
+static inline void list_del(struct list_head *entry)
 {
-	__cds_list_del(entry->prev, entry->next);
+	__list_del(entry->prev, entry->next);
 	entry->next = LIST_POISON1;
 	entry->prev = LIST_POISON2;
 }
 #else
-extern void cds_list_del(struct cds_list_head *entry);
+extern void list_del(struct list_head *entry);
 #endif
 
 /**
- * cds_list_replace - replace old entry by new one
+ * list_replace - replace old entry by new one
  * @old : the element to be replaced
  * @new : the new element to insert
  *
  * If @old was empty, it will be overwritten.
  */
-static inline void cds_list_replace(struct cds_list_head *old,
-				struct cds_list_head *new)
+static inline void list_replace(struct list_head *old,
+				struct list_head *new)
 {
 	new->next = old->next;
 	new->next->prev = new;
@@ -1125,44 +1125,44 @@ static inline void cds_list_replace(struct cds_list_head *old,
 	new->prev->next = new;
 }
 
-static inline void cds_list_replace_init(struct cds_list_head *old,
-					struct cds_list_head *new)
+static inline void list_replace_init(struct list_head *old,
+					struct list_head *new)
 {
-	cds_list_replace(old, new);
-	CDS_INIT_LIST_HEAD(old);
+	list_replace(old, new);
+	INIT_LIST_HEAD(old);
 }
 
 /**
- * cds_list_del_init - deletes entry from list and reinitialize it.
+ * list_del_init - deletes entry from list and reinitialize it.
  * @entry: the element to delete from the list.
  */
-static inline void cds_list_del_init(struct cds_list_head *entry)
+static inline void list_del_init(struct list_head *entry)
 {
-	__cds_list_del(entry->prev, entry->next);
-	CDS_INIT_LIST_HEAD(entry);
+	__list_del(entry->prev, entry->next);
+	INIT_LIST_HEAD(entry);
 }
 
 /**
- * cds_list_move - delete from one list and add as another's head
+ * list_move - delete from one list and add as another's head
  * @list: the entry to move
  * @head: the head that will precede our entry
  */
-static inline void cds_list_move(struct cds_list_head *list, struct cds_list_head *head)
+static inline void list_move(struct list_head *list, struct list_head *head)
 {
-	__cds_list_del(list->prev, list->next);
-	cds_list_add(list, head);
+	__list_del(list->prev, list->next);
+	list_add(list, head);
 }
 
 /**
- * cds_list_move_tail - delete from one list and add as another's tail
+ * list_move_tail - delete from one list and add as another's tail
  * @list: the entry to move
  * @head: the head that will follow our entry
  */
-static inline void cds_list_move_tail(struct cds_list_head *list,
-				  struct cds_list_head *head)
+static inline void list_move_tail(struct list_head *list,
+				  struct list_head *head)
 {
-	__cds_list_del(list->prev, list->next);
-	cds_list_add_tail(list, head);
+	__list_del(list->prev, list->next);
+	list_add_tail(list, head);
 }
 
 /**
@@ -1170,37 +1170,37 @@ static inline void cds_list_move_tail(struct cds_list_head *list,
  * @list: the entry to test
  * @head: the head of the list
  */
-static inline int list_is_last(const struct cds_list_head *list,
-				const struct cds_list_head *head)
+static inline int list_is_last(const struct list_head *list,
+				const struct list_head *head)
 {
 	return list->next == head;
 }
 
 /**
- * cds_list_empty - tests whether a list is empty
+ * list_empty - tests whether a list is empty
  * @head: the list to test.
  */
-static inline int cds_list_empty(const struct cds_list_head *head)
+static inline int list_empty(const struct list_head *head)
 {
 	return head->next == head;
 }
 
 /**
- * cds_list_empty_careful - tests whether a list is empty and not being modified
+ * list_empty_careful - tests whether a list is empty and not being modified
  * @head: the list to test
  *
  * Description:
  * tests whether a list is empty _and_ checks that no other CPU might be
  * in the process of modifying either member (next or prev)
  *
- * NOTE: using cds_list_empty_careful() without synchronization
+ * NOTE: using list_empty_careful() without synchronization
  * can only be safe if the only activity that can happen
- * to the list entry is cds_list_del_init(). Eg. it cannot be used
+ * to the list entry is list_del_init(). Eg. it cannot be used
  * if another CPU could re-list_add() it.
  */
-static inline int cds_list_empty_careful(const struct cds_list_head *head)
+static inline int list_empty_careful(const struct list_head *head)
 {
-	struct cds_list_head *next = head->next;
+	struct list_head *next = head->next;
 	return (next == head) && (next == head->prev);
 }
 
@@ -1208,15 +1208,15 @@ static inline int cds_list_empty_careful(const struct cds_list_head *head)
  * list_is_singular - tests whether a list has just one entry.
  * @head: the list to test.
  */
-static inline int list_is_singular(const struct cds_list_head *head)
+static inline int list_is_singular(const struct list_head *head)
 {
 	return !list_empty(head) && (head->next == head->prev);
 }
 
-static inline void __list_cut_position(struct cds_list_head *list,
-		struct cds_list_head *head, struct cds_list_head *entry)
+static inline void __list_cut_position(struct list_head *list,
+		struct list_head *head, struct list_head *entry)
 {
-	struct cds_list_head *new_first = entry->next;
+	struct list_head *new_first = entry->next;
 	list->next = head->next;
 	list->next->prev = list;
 	list->prev = entry;
@@ -1239,26 +1239,26 @@ static inline void __list_cut_position(struct cds_list_head *list,
  * losing its data.
  *
  */
-static inline void list_cut_position(struct cds_list_head *list,
-		struct cds_list_head *head, struct cds_list_head *entry)
+static inline void list_cut_position(struct list_head *list,
+		struct list_head *head, struct list_head *entry)
 {
-	if (cds_list_empty(head))
+	if (list_empty(head))
 		return;
 	if (list_is_singular(head) &&
 		(head->next != entry && head != entry))
 		return;
 	if (entry == head)
-		CDS_INIT_LIST_HEAD(list);
+		INIT_LIST_HEAD(list);
 	else
 		__list_cut_position(list, head, entry);
 }
 
-static inline void __cds_list_splice(const struct cds_list_head *list,
-				 struct cds_list_head *prev,
-				 struct cds_list_head *next)
+static inline void __list_splice(const struct list_head *list,
+				 struct list_head *prev,
+				 struct list_head *next)
 {
-	struct cds_list_head *first = list->next;
-	struct cds_list_head *last = list->prev;
+	struct list_head *first = list->next;
+	struct list_head *last = list->prev;
 
 	first->prev = prev;
 	prev->next = first;
@@ -1268,69 +1268,69 @@ static inline void __cds_list_splice(const struct cds_list_head *list,
 }
 
 /**
- * cds_list_splice - join two lists, this is designed for stacks
+ * list_splice - join two lists, this is designed for stacks
  * @list: the new list to add.
  * @head: the place to add it in the first list.
  */
-static inline void cds_list_splice(const struct cds_list_head *list,
-				struct cds_list_head *head)
+static inline void list_splice(const struct list_head *list,
+				struct list_head *head)
 {
-	if (!cds_list_empty(list))
-		__cds_list_splice(list, head, head->next);
+	if (!list_empty(list))
+		__list_splice(list, head, head->next);
 }
 
 /**
- * cds_list_splice_tail - join two lists, each list being a queue
+ * list_splice_tail - join two lists, each list being a queue
  * @list: the new list to add.
  * @head: the place to add it in the first list.
  */
-static inline void cds_list_splice_tail(struct cds_list_head *list,
-				struct cds_list_head *head)
+static inline void list_splice_tail(struct list_head *list,
+				struct list_head *head)
 {
-	if (!cds_list_empty(list))
-		__cds_list_splice(list, head->prev, head);
+	if (!list_empty(list))
+		__list_splice(list, head->prev, head);
 }
 
 /**
- * cds_list_splice_init - join two lists and reinitialise the emptied list.
+ * list_splice_init - join two lists and reinitialise the emptied list.
  * @list: the new list to add.
  * @head: the place to add it in the first list.
  *
  * The list at @list is reinitialised
  */
-static inline void cds_list_splice_init(struct cds_list_head *list,
-				    struct cds_list_head *head)
+static inline void list_splice_init(struct list_head *list,
+				    struct list_head *head)
 {
-	if (!cds_list_empty(list)) {
-		__cds_list_splice(list, head, head->next);
-		CDS_INIT_LIST_HEAD(list);
+	if (!list_empty(list)) {
+		__list_splice(list, head, head->next);
+		INIT_LIST_HEAD(list);
 	}
 }
 
 /**
- * cds_list_splice_tail_init - join two lists and reinitialise the emptied list
+ * list_splice_tail_init - join two lists and reinitialise the emptied list
  * @list: the new list to add.
  * @head: the place to add it in the first list.
  *
  * Each of the lists is a queue.
  * The list at @list is reinitialised
  */
-static inline void cds_list_splice_tail_init(struct cds_list_head *list,
-					 struct cds_list_head *head)
+static inline void list_splice_tail_init(struct list_head *list,
+					 struct list_head *head)
 {
-	if (!cds_list_empty(list)) {
-		__cds_list_splice(list, head->prev, head);
-		CDS_INIT_LIST_HEAD(list);
+	if (!list_empty(list)) {
+		__list_splice(list, head->prev, head);
+		INIT_LIST_HEAD(list);
 	}
 }
 
 /**
- * cds_list_entry - get the struct for this entry
- * @ptr:	the &struct cds_list_head pointer.
+ * list_entry - get the struct for this entry
+ * @ptr:	the &struct list_head pointer.
  * @type:	the type of the struct this is embedded in.
  * @member:	the name of the list_struct within the struct.
  */
-#define cds_list_entry(ptr, type, member) \
+#define list_entry(ptr, type, member) \
 	caa_container_of(ptr, type, member)
 
 /**
@@ -1342,95 +1342,95 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Note, that list is expected to be not empty.
  */
 #define list_first_entry(ptr, type, member) \
-	cds_list_entry((ptr)->next, type, member)
+	list_entry((ptr)->next, type, member)
 
 /**
- * cds_list_for_each	-	iterate over a list
- * @pos:	the &struct cds_list_head to use as a loop cursor.
+ * list_for_each	-	iterate over a list
+ * @pos:	the &struct list_head to use as a loop cursor.
  * @head:	the head for your list.
  */
-#define cds_list_for_each(pos, head) \
+#define list_for_each(pos, head) \
 	for (pos = (head)->next; prefetch(pos->next), pos != (head); \
         	pos = pos->next)
 
 /**
- * __cds_list_for_each	-	iterate over a list
- * @pos:	the &struct cds_list_head to use as a loop cursor.
+ * __list_for_each	-	iterate over a list
+ * @pos:	the &struct list_head to use as a loop cursor.
  * @head:	the head for your list.
  *
- * This variant differs from cds_list_for_each() in that it's the
+ * This variant differs from list_for_each() in that it's the
  * simplest possible list iteration code, no prefetching is done.
  * Use this for code that knows the list to be very short (empty
  * or 1 entry) most of the time.
  */
-#define __cds_list_for_each(pos, head) \
+#define __list_for_each(pos, head) \
 	for (pos = (head)->next; pos != (head); pos = pos->next)
 
 /**
- * cds_list_for_each_prev	-	iterate over a list backwards
- * @pos:	the &struct cds_list_head to use as a loop cursor.
+ * list_for_each_prev	-	iterate over a list backwards
+ * @pos:	the &struct list_head to use as a loop cursor.
  * @head:	the head for your list.
  */
-#define cds_list_for_each_prev(pos, head) \
+#define list_for_each_prev(pos, head) \
 	for (pos = (head)->prev; prefetch(pos->prev), pos != (head); \
         	pos = pos->prev)
 
 /**
- * cds_list_for_each_safe - iterate over a list safe against removal of list entry
- * @pos:	the &struct cds_list_head to use as a loop cursor.
- * @n:		another &struct cds_list_head to use as temporary storage
+ * list_for_each_safe - iterate over a list safe against removal of list entry
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @n:		another &struct list_head to use as temporary storage
  * @head:	the head for your list.
  */
-#define cds_list_for_each_safe(pos, n, head) \
+#define list_for_each_safe(pos, n, head) \
 	for (pos = (head)->next, n = pos->next; pos != (head); \
 		pos = n, n = pos->next)
 
 /**
- * cds_list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry
- * @pos:	the &struct cds_list_head to use as a loop cursor.
- * @n:		another &struct cds_list_head to use as temporary storage
+ * list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @n:		another &struct list_head to use as temporary storage
  * @head:	the head for your list.
  */
-#define cds_list_for_each_prev_safe(pos, n, head) \
+#define list_for_each_prev_safe(pos, n, head) \
 	for (pos = (head)->prev, n = pos->prev; \
 	     prefetch(pos->prev), pos != (head); \
 	     pos = n, n = pos->prev)
 
 /**
- * cds_list_for_each_entry	-	iterate over list of given type
+ * list_for_each_entry	-	iterate over list of given type
  * @pos:	the type * to use as a loop cursor.
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
  */
-#define cds_list_for_each_entry(pos, head, member)				\
-	for (pos = cds_list_entry((head)->next, typeof(*pos), member);	\
+#define list_for_each_entry(pos, head, member)				\
+	for (pos = list_entry((head)->next, typeof(*pos), member);	\
 	     prefetch(pos->member.next), &pos->member != (head); 	\
-	     pos = cds_list_entry(pos->member.next, typeof(*pos), member))
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
 
 /**
- * cds_list_for_each_entry_reverse - iterate backwards over list of given type.
+ * list_for_each_entry_reverse - iterate backwards over list of given type.
  * @pos:	the type * to use as a loop cursor.
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
  */
-#define cds_list_for_each_entry_reverse(pos, head, member)			\
-	for (pos = cds_list_entry((head)->prev, typeof(*pos), member);	\
+#define list_for_each_entry_reverse(pos, head, member)			\
+	for (pos = list_entry((head)->prev, typeof(*pos), member);	\
 	     prefetch(pos->member.prev), &pos->member != (head); 	\
-	     pos = cds_list_entry(pos->member.prev, typeof(*pos), member))
+	     pos = list_entry(pos->member.prev, typeof(*pos), member))
 
 /**
- * list_prepare_entry - prepare a pos entry for use in cds_list_for_each_entry_continue()
+ * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue()
  * @pos:	the type * to use as a start point
  * @head:	the head of the list
  * @member:	the name of the list_struct within the struct.
  *
- * Prepares a pos entry for use as a start point in cds_list_for_each_entry_continue().
+ * Prepares a pos entry for use as a start point in list_for_each_entry_continue().
  */
 #define list_prepare_entry(pos, head, member) \
-	((pos) ? : cds_list_entry(head, typeof(*pos), member))
+	((pos) ? : list_entry(head, typeof(*pos), member))
 
 /**
- * cds_list_for_each_entry_continue - continue iteration over list of given type
+ * list_for_each_entry_continue - continue iteration over list of given type
  * @pos:	the type * to use as a loop cursor.
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
@@ -1438,13 +1438,13 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Continue to iterate over list of given type, continuing after
  * the current position.
  */
-#define cds_list_for_each_entry_continue(pos, head, member) 		\
-	for (pos = cds_list_entry(pos->member.next, typeof(*pos), member);	\
+#define list_for_each_entry_continue(pos, head, member) 		\
+	for (pos = list_entry(pos->member.next, typeof(*pos), member);	\
 	     prefetch(pos->member.next), &pos->member != (head);	\
-	     pos = cds_list_entry(pos->member.next, typeof(*pos), member))
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
 
 /**
- * cds_list_for_each_entry_continue_reverse - iterate backwards from the given point
+ * list_for_each_entry_continue_reverse - iterate backwards from the given point
  * @pos:	the type * to use as a loop cursor.
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
@@ -1452,38 +1452,38 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Start to iterate over list of given type backwards, continuing after
  * the current position.
  */
-#define cds_list_for_each_entry_continue_reverse(pos, head, member)		\
-	for (pos = cds_list_entry(pos->member.prev, typeof(*pos), member);	\
+#define list_for_each_entry_continue_reverse(pos, head, member)		\
+	for (pos = list_entry(pos->member.prev, typeof(*pos), member);	\
 	     prefetch(pos->member.prev), &pos->member != (head);	\
-	     pos = cds_list_entry(pos->member.prev, typeof(*pos), member))
+	     pos = list_entry(pos->member.prev, typeof(*pos), member))
 
 /**
- * cds_list_for_each_entry_from - iterate over list of given type from the current point
+ * list_for_each_entry_from - iterate over list of given type from the current point
  * @pos:	the type * to use as a loop cursor.
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
  *
  * Iterate over list of given type, continuing from current position.
  */
-#define cds_list_for_each_entry_from(pos, head, member) 			\
+#define list_for_each_entry_from(pos, head, member) 			\
 	for (; prefetch(pos->member.next), &pos->member != (head);	\
-	     pos = cds_list_entry(pos->member.next, typeof(*pos), member))
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
 
 /**
- * cds_list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
  * @pos:	the type * to use as a loop cursor.
  * @n:		another type * to use as temporary storage
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
  */
-#define cds_list_for_each_entry_safe(pos, n, head, member)			\
-	for (pos = cds_list_entry((head)->next, typeof(*pos), member),	\
-		n = cds_list_entry(pos->member.next, typeof(*pos), member);	\
+#define list_for_each_entry_safe(pos, n, head, member)			\
+	for (pos = list_entry((head)->next, typeof(*pos), member),	\
+		n = list_entry(pos->member.next, typeof(*pos), member);	\
 	     &pos->member != (head); 					\
-	     pos = n, n = cds_list_entry(n->member.next, typeof(*n), member))
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
 
 /**
- * cds_list_for_each_entry_safe_continue
+ * list_for_each_entry_safe_continue
  * @pos:	the type * to use as a loop cursor.
  * @n:		another type * to use as temporary storage
  * @head:	the head for your list.
@@ -1492,14 +1492,14 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Iterate over list of given type, continuing after current point,
  * safe against removal of list entry.
  */
-#define cds_list_for_each_entry_safe_continue(pos, n, head, member) 		\
-	for (pos = cds_list_entry(pos->member.next, typeof(*pos), member), 		\
-		n = cds_list_entry(pos->member.next, typeof(*pos), member);		\
+#define list_for_each_entry_safe_continue(pos, n, head, member) 		\
+	for (pos = list_entry(pos->member.next, typeof(*pos), member), 		\
+		n = list_entry(pos->member.next, typeof(*pos), member);		\
 	     &pos->member != (head);						\
-	     pos = n, n = cds_list_entry(n->member.next, typeof(*n), member))
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
 
 /**
- * cds_list_for_each_entry_safe_from
+ * list_for_each_entry_safe_from
  * @pos:	the type * to use as a loop cursor.
  * @n:		another type * to use as temporary storage
  * @head:	the head for your list.
@@ -1508,13 +1508,13 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Iterate over list of given type from current point, safe against
  * removal of list entry.
  */
-#define cds_list_for_each_entry_safe_from(pos, n, head, member) 			\
-	for (n = cds_list_entry(pos->member.next, typeof(*pos), member);		\
+#define list_for_each_entry_safe_from(pos, n, head, member) 			\
+	for (n = list_entry(pos->member.next, typeof(*pos), member);		\
 	     &pos->member != (head);						\
-	     pos = n, n = cds_list_entry(n->member.next, typeof(*n), member))
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
 
 /**
- * cds_list_for_each_entry_safe_reverse
+ * list_for_each_entry_safe_reverse
  * @pos:	the type * to use as a loop cursor.
  * @n:		another type * to use as temporary storage
  * @head:	the head for your list.
@@ -1523,11 +1523,11 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Iterate backwards over list of given type, safe against removal
  * of list entry.
  */
-#define cds_list_for_each_entry_safe_reverse(pos, n, head, member)		\
-	for (pos = cds_list_entry((head)->prev, typeof(*pos), member),	\
-		n = cds_list_entry(pos->member.prev, typeof(*pos), member);	\
+#define list_for_each_entry_safe_reverse(pos, n, head, member)		\
+	for (pos = list_entry((head)->prev, typeof(*pos), member),	\
+		n = list_entry(pos->member.prev, typeof(*pos), member);	\
 	     &pos->member != (head); 					\
-	     pos = n, n = cds_list_entry(n->member.prev, typeof(*n), member))
+	     pos = n, n = list_entry(n->member.prev, typeof(*n), member))
 
 #endif //0
 
@@ -1538,60 +1538,60 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * You lose the ability to access the tail in O(1).
  */
 
-struct cds_hlist_head {
-	struct cds_hlist_node *first;
+struct hlist_head {
+	struct hlist_node *first;
 };
 
-struct cds_hlist_node {
-	struct cds_hlist_node *next, **pprev;
+struct hlist_node {
+	struct hlist_node *next, **pprev;
 };
 
 #define HLIST_HEAD_INIT { .first = NULL }
-#define HLIST_HEAD(name) struct cds_hlist_head name = {  .first = NULL }
-#define CDS_INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
-static inline void INIT_HLIST_NODE(struct cds_hlist_node *h)
+#define HLIST_HEAD(name) struct hlist_head name = {  .first = NULL }
+#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
+static inline void INIT_HLIST_NODE(struct hlist_node *h)
 {
 	h->next = NULL;
 	h->pprev = NULL;
 }
 
-static inline int hlist_unhashed(const struct cds_hlist_node *h)
+static inline int hlist_unhashed(const struct hlist_node *h)
 {
 	return !h->pprev;
 }
 
-static inline int hlist_empty(const struct cds_hlist_head *h)
+static inline int hlist_empty(const struct hlist_head *h)
 {
 	return !h->first;
 }
 
-static inline void __cds_hlist_del(struct cds_hlist_node *n)
+static inline void __hlist_del(struct hlist_node *n)
 {
-	struct cds_hlist_node *next = n->next;
-	struct cds_hlist_node **pprev = n->pprev;
+	struct hlist_node *next = n->next;
+	struct hlist_node **pprev = n->pprev;
 	*pprev = next;
 	if (next)
 		next->pprev = pprev;
 }
 
-static inline void cds_hlist_del(struct cds_hlist_node *n)
+static inline void hlist_del(struct hlist_node *n)
 {
-	__cds_hlist_del(n);
+	__hlist_del(n);
 	n->next = LIST_POISON1;
 	n->pprev = LIST_POISON2;
 }
 
-static inline void cds_hlist_del_init(struct cds_hlist_node *n)
+static inline void hlist_del_init(struct hlist_node *n)
 {
 	if (!hlist_unhashed(n)) {
-		__cds_hlist_del(n);
+		__hlist_del(n);
 		INIT_HLIST_NODE(n);
 	}
 }
 
-static inline void cds_hlist_add_head(struct cds_hlist_node *n, struct cds_hlist_head *h)
+static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
 {
-	struct cds_hlist_node *first = h->first;
+	struct hlist_node *first = h->first;
 	n->next = first;
 	if (first)
 		first->pprev = &n->next;
@@ -1600,8 +1600,8 @@ static inline void cds_hlist_add_head(struct cds_hlist_node *n, struct cds_hlist
 }
 
 /* next must be != NULL */
-static inline void hlist_add_before(struct cds_hlist_node *n,
-					struct cds_hlist_node *next)
+static inline void hlist_add_before(struct hlist_node *n,
+					struct hlist_node *next)
 {
 	n->pprev = next->pprev;
 	n->next = next;
@@ -1609,8 +1609,8 @@ static inline void hlist_add_before(struct cds_hlist_node *n,
 	*(n->pprev) = n;
 }
 
-static inline void hlist_add_after(struct cds_hlist_node *n,
-					struct cds_hlist_node *next)
+static inline void hlist_add_after(struct hlist_node *n,
+					struct hlist_node *next)
 {
 	next->next = n->next;
 	n->next = next;
@@ -1624,8 +1624,8 @@ static inline void hlist_add_after(struct cds_hlist_node *n,
  * Move a list from one list head to another. Fixup the pprev
  * reference of the first entry if it exists.
  */
-static inline void hlist_move_list(struct cds_hlist_head *old,
-				   struct cds_hlist_head *new)
+static inline void hlist_move_list(struct hlist_head *old,
+				   struct hlist_head *new)
 {
 	new->first = old->first;
 	if (new->first)
@@ -1633,64 +1633,64 @@ static inline void hlist_move_list(struct cds_hlist_head *old,
 	old->first = NULL;
 }
 
-#define cds_hlist_entry(ptr, type, member) caa_container_of(ptr,type,member)
+#define hlist_entry(ptr, type, member) caa_container_of(ptr,type,member)
 
-#define cds_hlist_for_each(pos, head) \
+#define hlist_for_each(pos, head) \
 	for (pos = (head)->first; pos && ({ prefetch(pos->next); 1; }); \
 	     pos = pos->next)
 
-#define cds_hlist_for_each_safe(pos, n, head) \
+#define hlist_for_each_safe(pos, n, head) \
 	for (pos = (head)->first; pos && ({ n = pos->next; 1; }); \
 	     pos = n)
 
 /**
- * cds_hlist_for_each_entry	- iterate over list of given type
+ * hlist_for_each_entry	- iterate over list of given type
  * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct cds_hlist_node to use as a loop cursor.
+ * @pos:	the &struct hlist_node to use as a loop cursor.
  * @head:	the head for your list.
- * @member:	the name of the cds_hlist_node within the struct.
+ * @member:	the name of the hlist_node within the struct.
  */
-#define cds_hlist_for_each_entry(tpos, pos, head, member)			 \
+#define hlist_for_each_entry(tpos, pos, head, member)			 \
 	for (pos = (head)->first;					 \
 	     pos && ({ prefetch(pos->next); 1;}) &&			 \
-		({ tpos = cds_hlist_entry(pos, typeof(*tpos), member); 1;}); \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
 	     pos = pos->next)
 
 /**
- * cds_hlist_for_each_entry_continue - iterate over a hlist continuing after current point
+ * hlist_for_each_entry_continue - iterate over a hlist continuing after current point
  * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct cds_hlist_node to use as a loop cursor.
- * @member:	the name of the cds_hlist_node within the struct.
+ * @pos:	the &struct hlist_node to use as a loop cursor.
+ * @member:	the name of the hlist_node within the struct.
  */
-#define cds_hlist_for_each_entry_continue(tpos, pos, member)		 \
+#define hlist_for_each_entry_continue(tpos, pos, member)		 \
 	for (pos = (pos)->next;						 \
 	     pos && ({ prefetch(pos->next); 1;}) &&			 \
-		({ tpos = cds_hlist_entry(pos, typeof(*tpos), member); 1;}); \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
 	     pos = pos->next)
 
 /**
- * cds_hlist_for_each_entry_from - iterate over a hlist continuing from current point
+ * hlist_for_each_entry_from - iterate over a hlist continuing from current point
  * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct cds_hlist_node to use as a loop cursor.
- * @member:	the name of the cds_hlist_node within the struct.
+ * @pos:	the &struct hlist_node to use as a loop cursor.
+ * @member:	the name of the hlist_node within the struct.
  */
-#define cds_hlist_for_each_entry_from(tpos, pos, member)			 \
+#define hlist_for_each_entry_from(tpos, pos, member)			 \
 	for (; pos && ({ prefetch(pos->next); 1;}) &&			 \
-		({ tpos = cds_hlist_entry(pos, typeof(*tpos), member); 1;}); \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
 	     pos = pos->next)
 
 /**
- * cds_hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
  * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct cds_hlist_node to use as a loop cursor.
- * @n:		another &struct cds_hlist_node to use as temporary storage
+ * @pos:	the &struct hlist_node to use as a loop cursor.
+ * @n:		another &struct hlist_node to use as temporary storage
  * @head:	the head for your list.
- * @member:	the name of the cds_hlist_node within the struct.
+ * @member:	the name of the hlist_node within the struct.
  */
-#define cds_hlist_for_each_entry_safe(tpos, pos, n, head, member) 		 \
+#define hlist_for_each_entry_safe(tpos, pos, n, head, member) 		 \
 	for (pos = (head)->first;					 \
 	     pos && ({ n = pos->next; 1; }) && 				 \
-		({ tpos = cds_hlist_entry(pos, typeof(*tpos), member); 1;}); \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
 	     pos = n)
 
 #endif
diff --git a/tests/api_x86.h b/tests/api_x86.h
index 527221c..d841757 100644
--- a/tests/api_x86.h
+++ b/tests/api_x86.h
@@ -718,16 +718,16 @@ static void smp_init(void)
  * using the generic single-entry routines.
  */
 
-struct cds_list_head {
-	struct cds_list_head *next, *prev;
+struct list_head {
+	struct list_head *next, *prev;
 };
 
-#define CDS_LIST_HEAD_INIT(name) { &(name), &(name) }
+#define LIST_HEAD_INIT(name) { &(name), &(name) }
 
-#define CDS_LIST_HEAD(name) \
-	struct cds_list_head name = CDS_LIST_HEAD_INIT(name)
+#define LIST_HEAD(name) \
+	struct list_head name = LIST_HEAD_INIT(name)
 
-static inline void CDS_INIT_LIST_HEAD(struct cds_list_head *list)
+static inline void INIT_LIST_HEAD(struct list_head *list)
 {
 	list->next = list;
 	list->prev = list;
@@ -740,9 +740,9 @@ static inline void CDS_INIT_LIST_HEAD(struct cds_list_head *list)
  * the prev/next entries already!
  */
 #ifndef CONFIG_DEBUG_LIST
-static inline void __cds_list_add(struct cds_list_head *new,
-			      struct cds_list_head *prev,
-			      struct cds_list_head *next)
+static inline void __list_add(struct list_head *new,
+			      struct list_head *prev,
+			      struct list_head *next)
 {
 	next->prev = new;
 	new->next = next;
@@ -750,36 +750,36 @@ static inline void __cds_list_add(struct cds_list_head *new,
 	prev->next = new;
 }
 #else
-extern void __cds_list_add(struct cds_list_head *new,
-			      struct cds_list_head *prev,
-			      struct cds_list_head *next);
+extern void __list_add(struct list_head *new,
+			      struct list_head *prev,
+			      struct list_head *next);
 #endif
 
 /**
- * cds_list_add - add a new entry
+ * list_add - add a new entry
  * @new: new entry to be added
  * @head: list head to add it after
  *
  * Insert a new entry after the specified head.
  * This is good for implementing stacks.
  */
-static inline void cds_list_add(struct cds_list_head *new, struct cds_list_head *head)
+static inline void list_add(struct list_head *new, struct list_head *head)
 {
-	__cds_list_add(new, head, head->next);
+	__list_add(new, head, head->next);
 }
 
 
 /**
- * cds_list_add_tail - add a new entry
+ * list_add_tail - add a new entry
  * @new: new entry to be added
  * @head: list head to add it before
  *
  * Insert a new entry before the specified head.
  * This is useful for implementing queues.
  */
-static inline void cds_list_add_tail(struct cds_list_head *new, struct cds_list_head *head)
+static inline void list_add_tail(struct list_head *new, struct list_head *head)
 {
-	__cds_list_add(new, head->prev, head);
+	__list_add(new, head->prev, head);
 }
 
 /*
@@ -789,38 +789,38 @@ static inline void cds_list_add_tail(struct cds_list_head *new, struct cds_list_
  * This is only for internal list manipulation where we know
  * the prev/next entries already!
  */
-static inline void __cds_list_del(struct cds_list_head * prev, struct cds_list_head * next)
+static inline void __list_del(struct list_head * prev, struct list_head * next)
 {
 	next->prev = prev;
 	prev->next = next;
 }
 
 /**
- * cds_list_del - deletes entry from list.
+ * list_del - deletes entry from list.
  * @entry: the element to delete from the list.
- * Note: cds_list_empty() on entry does not return true after this, the entry is
+ * Note: list_empty() on entry does not return true after this, the entry is
  * in an undefined state.
  */
 #ifndef CONFIG_DEBUG_LIST
-static inline void cds_list_del(struct cds_list_head *entry)
+static inline void list_del(struct list_head *entry)
 {
-	__cds_list_del(entry->prev, entry->next);
+	__list_del(entry->prev, entry->next);
 	entry->next = LIST_POISON1;
 	entry->prev = LIST_POISON2;
 }
 #else
-extern void cds_list_del(struct cds_list_head *entry);
+extern void list_del(struct list_head *entry);
 #endif
 
 /**
- * cds_list_replace - replace old entry by new one
+ * list_replace - replace old entry by new one
  * @old : the element to be replaced
  * @new : the new element to insert
  *
  * If @old was empty, it will be overwritten.
  */
-static inline void cds_list_replace(struct cds_list_head *old,
-				struct cds_list_head *new)
+static inline void list_replace(struct list_head *old,
+				struct list_head *new)
 {
 	new->next = old->next;
 	new->next->prev = new;
@@ -828,44 +828,44 @@ static inline void cds_list_replace(struct cds_list_head *old,
 	new->prev->next = new;
 }
 
-static inline void cds_list_replace_init(struct cds_list_head *old,
-					struct cds_list_head *new)
+static inline void list_replace_init(struct list_head *old,
+					struct list_head *new)
 {
-	cds_list_replace(old, new);
-	CDS_INIT_LIST_HEAD(old);
+	list_replace(old, new);
+	INIT_LIST_HEAD(old);
 }
 
 /**
- * cds_list_del_init - deletes entry from list and reinitialize it.
+ * list_del_init - deletes entry from list and reinitialize it.
  * @entry: the element to delete from the list.
  */
-static inline void cds_list_del_init(struct cds_list_head *entry)
+static inline void list_del_init(struct list_head *entry)
 {
-	__cds_list_del(entry->prev, entry->next);
-	CDS_INIT_LIST_HEAD(entry);
+	__list_del(entry->prev, entry->next);
+	INIT_LIST_HEAD(entry);
 }
 
 /**
- * cds_list_move - delete from one list and add as another's head
+ * list_move - delete from one list and add as another's head
  * @list: the entry to move
  * @head: the head that will precede our entry
  */
-static inline void cds_list_move(struct cds_list_head *list, struct cds_list_head *head)
+static inline void list_move(struct list_head *list, struct list_head *head)
 {
-	__cds_list_del(list->prev, list->next);
-	cds_list_add(list, head);
+	__list_del(list->prev, list->next);
+	list_add(list, head);
 }
 
 /**
- * cds_list_move_tail - delete from one list and add as another's tail
+ * list_move_tail - delete from one list and add as another's tail
  * @list: the entry to move
  * @head: the head that will follow our entry
  */
-static inline void cds_list_move_tail(struct cds_list_head *list,
-				  struct cds_list_head *head)
+static inline void list_move_tail(struct list_head *list,
+				  struct list_head *head)
 {
-	__cds_list_del(list->prev, list->next);
-	cds_list_add_tail(list, head);
+	__list_del(list->prev, list->next);
+	list_add_tail(list, head);
 }
 
 /**
@@ -873,37 +873,37 @@ static inline void cds_list_move_tail(struct cds_list_head *list,
  * @list: the entry to test
  * @head: the head of the list
  */
-static inline int list_is_last(const struct cds_list_head *list,
-				const struct cds_list_head *head)
+static inline int list_is_last(const struct list_head *list,
+				const struct list_head *head)
 {
 	return list->next == head;
 }
 
 /**
- * cds_list_empty - tests whether a list is empty
+ * list_empty - tests whether a list is empty
  * @head: the list to test.
  */
-static inline int cds_list_empty(const struct cds_list_head *head)
+static inline int list_empty(const struct list_head *head)
 {
 	return head->next == head;
 }
 
 /**
- * cds_list_empty_careful - tests whether a list is empty and not being modified
+ * list_empty_careful - tests whether a list is empty and not being modified
  * @head: the list to test
  *
  * Description:
  * tests whether a list is empty _and_ checks that no other CPU might be
  * in the process of modifying either member (next or prev)
  *
- * NOTE: using cds_list_empty_careful() without synchronization
+ * NOTE: using list_empty_careful() without synchronization
  * can only be safe if the only activity that can happen
- * to the list entry is cds_list_del_init(). Eg. it cannot be used
+ * to the list entry is list_del_init(). Eg. it cannot be used
  * if another CPU could re-list_add() it.
  */
-static inline int cds_list_empty_careful(const struct cds_list_head *head)
+static inline int list_empty_careful(const struct list_head *head)
 {
-	struct cds_list_head *next = head->next;
+	struct list_head *next = head->next;
 	return (next == head) && (next == head->prev);
 }
 
@@ -911,15 +911,15 @@ static inline int cds_list_empty_careful(const struct cds_list_head *head)
  * list_is_singular - tests whether a list has just one entry.
  * @head: the list to test.
  */
-static inline int list_is_singular(const struct cds_list_head *head)
+static inline int list_is_singular(const struct list_head *head)
 {
 	return !list_empty(head) && (head->next == head->prev);
 }
 
-static inline void __list_cut_position(struct cds_list_head *list,
-		struct cds_list_head *head, struct cds_list_head *entry)
+static inline void __list_cut_position(struct list_head *list,
+		struct list_head *head, struct list_head *entry)
 {
-	struct cds_list_head *new_first = entry->next;
+	struct list_head *new_first = entry->next;
 	list->next = head->next;
 	list->next->prev = list;
 	list->prev = entry;
@@ -942,26 +942,26 @@ static inline void __list_cut_position(struct cds_list_head *list,
  * losing its data.
  *
  */
-static inline void list_cut_position(struct cds_list_head *list,
-		struct cds_list_head *head, struct cds_list_head *entry)
+static inline void list_cut_position(struct list_head *list,
+		struct list_head *head, struct list_head *entry)
 {
-	if (cds_list_empty(head))
+	if (list_empty(head))
 		return;
 	if (list_is_singular(head) &&
 		(head->next != entry && head != entry))
 		return;
 	if (entry == head)
-		CDS_INIT_LIST_HEAD(list);
+		INIT_LIST_HEAD(list);
 	else
 		__list_cut_position(list, head, entry);
 }
 
-static inline void __cds_list_splice(const struct cds_list_head *list,
-				 struct cds_list_head *prev,
-				 struct cds_list_head *next)
+static inline void __list_splice(const struct list_head *list,
+				 struct list_head *prev,
+				 struct list_head *next)
 {
-	struct cds_list_head *first = list->next;
-	struct cds_list_head *last = list->prev;
+	struct list_head *first = list->next;
+	struct list_head *last = list->prev;
 
 	first->prev = prev;
 	prev->next = first;
@@ -971,69 +971,69 @@ static inline void __cds_list_splice(const struct cds_list_head *list,
 }
 
 /**
- * cds_list_splice - join two lists, this is designed for stacks
+ * list_splice - join two lists, this is designed for stacks
  * @list: the new list to add.
  * @head: the place to add it in the first list.
  */
-static inline void cds_list_splice(const struct cds_list_head *list,
-				struct cds_list_head *head)
+static inline void list_splice(const struct list_head *list,
+				struct list_head *head)
 {
-	if (!cds_list_empty(list))
-		__cds_list_splice(list, head, head->next);
+	if (!list_empty(list))
+		__list_splice(list, head, head->next);
 }
 
 /**
- * cds_list_splice_tail - join two lists, each list being a queue
+ * list_splice_tail - join two lists, each list being a queue
  * @list: the new list to add.
  * @head: the place to add it in the first list.
  */
-static inline void cds_list_splice_tail(struct cds_list_head *list,
-				struct cds_list_head *head)
+static inline void list_splice_tail(struct list_head *list,
+				struct list_head *head)
 {
-	if (!cds_list_empty(list))
-		__cds_list_splice(list, head->prev, head);
+	if (!list_empty(list))
+		__list_splice(list, head->prev, head);
 }
 
 /**
- * cds_list_splice_init - join two lists and reinitialise the emptied list.
+ * list_splice_init - join two lists and reinitialise the emptied list.
  * @list: the new list to add.
  * @head: the place to add it in the first list.
  *
  * The list at @list is reinitialised
  */
-static inline void cds_list_splice_init(struct cds_list_head *list,
-				    struct cds_list_head *head)
+static inline void list_splice_init(struct list_head *list,
+				    struct list_head *head)
 {
-	if (!cds_list_empty(list)) {
-		__cds_list_splice(list, head, head->next);
-		CDS_INIT_LIST_HEAD(list);
+	if (!list_empty(list)) {
+		__list_splice(list, head, head->next);
+		INIT_LIST_HEAD(list);
 	}
 }
 
 /**
- * cds_list_splice_tail_init - join two lists and reinitialise the emptied list
+ * list_splice_tail_init - join two lists and reinitialise the emptied list
  * @list: the new list to add.
  * @head: the place to add it in the first list.
  *
  * Each of the lists is a queue.
  * The list at @list is reinitialised
  */
-static inline void cds_list_splice_tail_init(struct cds_list_head *list,
-					 struct cds_list_head *head)
+static inline void list_splice_tail_init(struct list_head *list,
+					 struct list_head *head)
 {
-	if (!cds_list_empty(list)) {
-		__cds_list_splice(list, head->prev, head);
-		CDS_INIT_LIST_HEAD(list);
+	if (!list_empty(list)) {
+		__list_splice(list, head->prev, head);
+		INIT_LIST_HEAD(list);
 	}
 }
 
 /**
- * cds_list_entry - get the struct for this entry
- * @ptr:	the &struct cds_list_head pointer.
+ * list_entry - get the struct for this entry
+ * @ptr:	the &struct list_head pointer.
  * @type:	the type of the struct this is embedded in.
  * @member:	the name of the list_struct within the struct.
  */
-#define cds_list_entry(ptr, type, member) \
+#define list_entry(ptr, type, member) \
 	caa_container_of(ptr, type, member)
 
 /**
@@ -1045,95 +1045,95 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Note, that list is expected to be not empty.
  */
 #define list_first_entry(ptr, type, member) \
-	cds_list_entry((ptr)->next, type, member)
+	list_entry((ptr)->next, type, member)
 
 /**
- * cds_list_for_each	-	iterate over a list
- * @pos:	the &struct cds_list_head to use as a loop cursor.
+ * list_for_each	-	iterate over a list
+ * @pos:	the &struct list_head to use as a loop cursor.
  * @head:	the head for your list.
  */
-#define cds_list_for_each(pos, head) \
+#define list_for_each(pos, head) \
 	for (pos = (head)->next; prefetch(pos->next), pos != (head); \
         	pos = pos->next)
 
 /**
- * __cds_list_for_each	-	iterate over a list
- * @pos:	the &struct cds_list_head to use as a loop cursor.
+ * __list_for_each	-	iterate over a list
+ * @pos:	the &struct list_head to use as a loop cursor.
  * @head:	the head for your list.
  *
- * This variant differs from cds_list_for_each() in that it's the
+ * This variant differs from list_for_each() in that it's the
  * simplest possible list iteration code, no prefetching is done.
  * Use this for code that knows the list to be very short (empty
  * or 1 entry) most of the time.
  */
-#define __cds_list_for_each(pos, head) \
+#define __list_for_each(pos, head) \
 	for (pos = (head)->next; pos != (head); pos = pos->next)
 
 /**
- * cds_list_for_each_prev	-	iterate over a list backwards
- * @pos:	the &struct cds_list_head to use as a loop cursor.
+ * list_for_each_prev	-	iterate over a list backwards
+ * @pos:	the &struct list_head to use as a loop cursor.
  * @head:	the head for your list.
  */
-#define cds_list_for_each_prev(pos, head) \
+#define list_for_each_prev(pos, head) \
 	for (pos = (head)->prev; prefetch(pos->prev), pos != (head); \
         	pos = pos->prev)
 
 /**
- * cds_list_for_each_safe - iterate over a list safe against removal of list entry
- * @pos:	the &struct cds_list_head to use as a loop cursor.
- * @n:		another &struct cds_list_head to use as temporary storage
+ * list_for_each_safe - iterate over a list safe against removal of list entry
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @n:		another &struct list_head to use as temporary storage
  * @head:	the head for your list.
  */
-#define cds_list_for_each_safe(pos, n, head) \
+#define list_for_each_safe(pos, n, head) \
 	for (pos = (head)->next, n = pos->next; pos != (head); \
 		pos = n, n = pos->next)
 
 /**
- * cds_list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry
- * @pos:	the &struct cds_list_head to use as a loop cursor.
- * @n:		another &struct cds_list_head to use as temporary storage
+ * list_for_each_prev_safe - iterate over a list backwards safe against removal of list entry
+ * @pos:	the &struct list_head to use as a loop cursor.
+ * @n:		another &struct list_head to use as temporary storage
  * @head:	the head for your list.
  */
-#define cds_list_for_each_prev_safe(pos, n, head) \
+#define list_for_each_prev_safe(pos, n, head) \
 	for (pos = (head)->prev, n = pos->prev; \
 	     prefetch(pos->prev), pos != (head); \
 	     pos = n, n = pos->prev)
 
 /**
- * cds_list_for_each_entry	-	iterate over list of given type
+ * list_for_each_entry	-	iterate over list of given type
  * @pos:	the type * to use as a loop cursor.
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
  */
-#define cds_list_for_each_entry(pos, head, member)				\
-	for (pos = cds_list_entry((head)->next, typeof(*pos), member);	\
+#define list_for_each_entry(pos, head, member)				\
+	for (pos = list_entry((head)->next, typeof(*pos), member);	\
 	     prefetch(pos->member.next), &pos->member != (head); 	\
-	     pos = cds_list_entry(pos->member.next, typeof(*pos), member))
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
 
 /**
- * cds_list_for_each_entry_reverse - iterate backwards over list of given type.
+ * list_for_each_entry_reverse - iterate backwards over list of given type.
  * @pos:	the type * to use as a loop cursor.
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
  */
-#define cds_list_for_each_entry_reverse(pos, head, member)			\
-	for (pos = cds_list_entry((head)->prev, typeof(*pos), member);	\
+#define list_for_each_entry_reverse(pos, head, member)			\
+	for (pos = list_entry((head)->prev, typeof(*pos), member);	\
 	     prefetch(pos->member.prev), &pos->member != (head); 	\
-	     pos = cds_list_entry(pos->member.prev, typeof(*pos), member))
+	     pos = list_entry(pos->member.prev, typeof(*pos), member))
 
 /**
- * list_prepare_entry - prepare a pos entry for use in cds_list_for_each_entry_continue()
+ * list_prepare_entry - prepare a pos entry for use in list_for_each_entry_continue()
  * @pos:	the type * to use as a start point
  * @head:	the head of the list
  * @member:	the name of the list_struct within the struct.
  *
- * Prepares a pos entry for use as a start point in cds_list_for_each_entry_continue().
+ * Prepares a pos entry for use as a start point in list_for_each_entry_continue().
  */
 #define list_prepare_entry(pos, head, member) \
-	((pos) ? : cds_list_entry(head, typeof(*pos), member))
+	((pos) ? : list_entry(head, typeof(*pos), member))
 
 /**
- * cds_list_for_each_entry_continue - continue iteration over list of given type
+ * list_for_each_entry_continue - continue iteration over list of given type
  * @pos:	the type * to use as a loop cursor.
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
@@ -1141,13 +1141,13 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Continue to iterate over list of given type, continuing after
  * the current position.
  */
-#define cds_list_for_each_entry_continue(pos, head, member) 		\
-	for (pos = cds_list_entry(pos->member.next, typeof(*pos), member);	\
+#define list_for_each_entry_continue(pos, head, member) 		\
+	for (pos = list_entry(pos->member.next, typeof(*pos), member);	\
 	     prefetch(pos->member.next), &pos->member != (head);	\
-	     pos = cds_list_entry(pos->member.next, typeof(*pos), member))
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
 
 /**
- * cds_list_for_each_entry_continue_reverse - iterate backwards from the given point
+ * list_for_each_entry_continue_reverse - iterate backwards from the given point
  * @pos:	the type * to use as a loop cursor.
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
@@ -1155,38 +1155,38 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Start to iterate over list of given type backwards, continuing after
  * the current position.
  */
-#define cds_list_for_each_entry_continue_reverse(pos, head, member)		\
-	for (pos = cds_list_entry(pos->member.prev, typeof(*pos), member);	\
+#define list_for_each_entry_continue_reverse(pos, head, member)		\
+	for (pos = list_entry(pos->member.prev, typeof(*pos), member);	\
 	     prefetch(pos->member.prev), &pos->member != (head);	\
-	     pos = cds_list_entry(pos->member.prev, typeof(*pos), member))
+	     pos = list_entry(pos->member.prev, typeof(*pos), member))
 
 /**
- * cds_list_for_each_entry_from - iterate over list of given type from the current point
+ * list_for_each_entry_from - iterate over list of given type from the current point
  * @pos:	the type * to use as a loop cursor.
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
  *
  * Iterate over list of given type, continuing from current position.
  */
-#define cds_list_for_each_entry_from(pos, head, member) 			\
+#define list_for_each_entry_from(pos, head, member) 			\
 	for (; prefetch(pos->member.next), &pos->member != (head);	\
-	     pos = cds_list_entry(pos->member.next, typeof(*pos), member))
+	     pos = list_entry(pos->member.next, typeof(*pos), member))
 
 /**
- * cds_list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry
  * @pos:	the type * to use as a loop cursor.
  * @n:		another type * to use as temporary storage
  * @head:	the head for your list.
  * @member:	the name of the list_struct within the struct.
  */
-#define cds_list_for_each_entry_safe(pos, n, head, member)			\
-	for (pos = cds_list_entry((head)->next, typeof(*pos), member),	\
-		n = cds_list_entry(pos->member.next, typeof(*pos), member);	\
+#define list_for_each_entry_safe(pos, n, head, member)			\
+	for (pos = list_entry((head)->next, typeof(*pos), member),	\
+		n = list_entry(pos->member.next, typeof(*pos), member);	\
 	     &pos->member != (head); 					\
-	     pos = n, n = cds_list_entry(n->member.next, typeof(*n), member))
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
 
 /**
- * cds_list_for_each_entry_safe_continue
+ * list_for_each_entry_safe_continue
  * @pos:	the type * to use as a loop cursor.
  * @n:		another type * to use as temporary storage
  * @head:	the head for your list.
@@ -1195,14 +1195,14 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Iterate over list of given type, continuing after current point,
  * safe against removal of list entry.
  */
-#define cds_list_for_each_entry_safe_continue(pos, n, head, member) 		\
-	for (pos = cds_list_entry(pos->member.next, typeof(*pos), member), 		\
-		n = cds_list_entry(pos->member.next, typeof(*pos), member);		\
+#define list_for_each_entry_safe_continue(pos, n, head, member) 		\
+	for (pos = list_entry(pos->member.next, typeof(*pos), member), 		\
+		n = list_entry(pos->member.next, typeof(*pos), member);		\
 	     &pos->member != (head);						\
-	     pos = n, n = cds_list_entry(n->member.next, typeof(*n), member))
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
 
 /**
- * cds_list_for_each_entry_safe_from
+ * list_for_each_entry_safe_from
  * @pos:	the type * to use as a loop cursor.
  * @n:		another type * to use as temporary storage
  * @head:	the head for your list.
@@ -1211,13 +1211,13 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Iterate over list of given type from current point, safe against
  * removal of list entry.
  */
-#define cds_list_for_each_entry_safe_from(pos, n, head, member) 			\
-	for (n = cds_list_entry(pos->member.next, typeof(*pos), member);		\
+#define list_for_each_entry_safe_from(pos, n, head, member) 			\
+	for (n = list_entry(pos->member.next, typeof(*pos), member);		\
 	     &pos->member != (head);						\
-	     pos = n, n = cds_list_entry(n->member.next, typeof(*n), member))
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))
 
 /**
- * cds_list_for_each_entry_safe_reverse
+ * list_for_each_entry_safe_reverse
  * @pos:	the type * to use as a loop cursor.
  * @n:		another type * to use as temporary storage
  * @head:	the head for your list.
@@ -1226,11 +1226,11 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * Iterate backwards over list of given type, safe against removal
  * of list entry.
  */
-#define cds_list_for_each_entry_safe_reverse(pos, n, head, member)		\
-	for (pos = cds_list_entry((head)->prev, typeof(*pos), member),	\
-		n = cds_list_entry(pos->member.prev, typeof(*pos), member);	\
+#define list_for_each_entry_safe_reverse(pos, n, head, member)		\
+	for (pos = list_entry((head)->prev, typeof(*pos), member),	\
+		n = list_entry(pos->member.prev, typeof(*pos), member);	\
 	     &pos->member != (head); 					\
-	     pos = n, n = cds_list_entry(n->member.prev, typeof(*n), member))
+	     pos = n, n = list_entry(n->member.prev, typeof(*n), member))
 
 #endif //0
 
@@ -1241,60 +1241,60 @@ static inline void cds_list_splice_tail_init(struct cds_list_head *list,
  * You lose the ability to access the tail in O(1).
  */
 
-struct cds_hlist_head {
-	struct cds_hlist_node *first;
+struct hlist_head {
+	struct hlist_node *first;
 };
 
-struct cds_hlist_node {
-	struct cds_hlist_node *next, **pprev;
+struct hlist_node {
+	struct hlist_node *next, **pprev;
 };
 
 #define HLIST_HEAD_INIT { .first = NULL }
-#define HLIST_HEAD(name) struct cds_hlist_head name = {  .first = NULL }
-#define CDS_INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
-static inline void INIT_HLIST_NODE(struct cds_hlist_node *h)
+#define HLIST_HEAD(name) struct hlist_head name = {  .first = NULL }
+#define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
+static inline void INIT_HLIST_NODE(struct hlist_node *h)
 {
 	h->next = NULL;
 	h->pprev = NULL;
 }
 
-static inline int hlist_unhashed(const struct cds_hlist_node *h)
+static inline int hlist_unhashed(const struct hlist_node *h)
 {
 	return !h->pprev;
 }
 
-static inline int hlist_empty(const struct cds_hlist_head *h)
+static inline int hlist_empty(const struct hlist_head *h)
 {
 	return !h->first;
 }
 
-static inline void __cds_hlist_del(struct cds_hlist_node *n)
+static inline void __hlist_del(struct hlist_node *n)
 {
-	struct cds_hlist_node *next = n->next;
-	struct cds_hlist_node **pprev = n->pprev;
+	struct hlist_node *next = n->next;
+	struct hlist_node **pprev = n->pprev;
 	*pprev = next;
 	if (next)
 		next->pprev = pprev;
 }
 
-static inline void cds_hlist_del(struct cds_hlist_node *n)
+static inline void hlist_del(struct hlist_node *n)
 {
-	__cds_hlist_del(n);
+	__hlist_del(n);
 	n->next = LIST_POISON1;
 	n->pprev = LIST_POISON2;
 }
 
-static inline void cds_hlist_del_init(struct cds_hlist_node *n)
+static inline void hlist_del_init(struct hlist_node *n)
 {
 	if (!hlist_unhashed(n)) {
-		__cds_hlist_del(n);
+		__hlist_del(n);
 		INIT_HLIST_NODE(n);
 	}
 }
 
-static inline void cds_hlist_add_head(struct cds_hlist_node *n, struct cds_hlist_head *h)
+static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
 {
-	struct cds_hlist_node *first = h->first;
+	struct hlist_node *first = h->first;
 	n->next = first;
 	if (first)
 		first->pprev = &n->next;
@@ -1303,8 +1303,8 @@ static inline void cds_hlist_add_head(struct cds_hlist_node *n, struct cds_hlist
 }
 
 /* next must be != NULL */
-static inline void hlist_add_before(struct cds_hlist_node *n,
-					struct cds_hlist_node *next)
+static inline void hlist_add_before(struct hlist_node *n,
+					struct hlist_node *next)
 {
 	n->pprev = next->pprev;
 	n->next = next;
@@ -1312,8 +1312,8 @@ static inline void hlist_add_before(struct cds_hlist_node *n,
 	*(n->pprev) = n;
 }
 
-static inline void hlist_add_after(struct cds_hlist_node *n,
-					struct cds_hlist_node *next)
+static inline void hlist_add_after(struct hlist_node *n,
+					struct hlist_node *next)
 {
 	next->next = n->next;
 	n->next = next;
@@ -1327,8 +1327,8 @@ static inline void hlist_add_after(struct cds_hlist_node *n,
  * Move a list from one list head to another. Fixup the pprev
  * reference of the first entry if it exists.
  */
-static inline void hlist_move_list(struct cds_hlist_head *old,
-				   struct cds_hlist_head *new)
+static inline void hlist_move_list(struct hlist_head *old,
+				   struct hlist_head *new)
 {
 	new->first = old->first;
 	if (new->first)
@@ -1336,64 +1336,64 @@ static inline void hlist_move_list(struct cds_hlist_head *old,
 	old->first = NULL;
 }
 
-#define cds_hlist_entry(ptr, type, member) caa_container_of(ptr,type,member)
+#define hlist_entry(ptr, type, member) caa_container_of(ptr,type,member)
 
-#define cds_hlist_for_each(pos, head) \
+#define hlist_for_each(pos, head) \
 	for (pos = (head)->first; pos && ({ prefetch(pos->next); 1; }); \
 	     pos = pos->next)
 
-#define cds_hlist_for_each_safe(pos, n, head) \
+#define hlist_for_each_safe(pos, n, head) \
 	for (pos = (head)->first; pos && ({ n = pos->next; 1; }); \
 	     pos = n)
 
 /**
- * cds_hlist_for_each_entry	- iterate over list of given type
+ * hlist_for_each_entry	- iterate over list of given type
  * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct cds_hlist_node to use as a loop cursor.
+ * @pos:	the &struct hlist_node to use as a loop cursor.
  * @head:	the head for your list.
- * @member:	the name of the cds_hlist_node within the struct.
+ * @member:	the name of the hlist_node within the struct.
  */
-#define cds_hlist_for_each_entry(tpos, pos, head, member)			 \
+#define hlist_for_each_entry(tpos, pos, head, member)			 \
 	for (pos = (head)->first;					 \
 	     pos && ({ prefetch(pos->next); 1;}) &&			 \
-		({ tpos = cds_hlist_entry(pos, typeof(*tpos), member); 1;}); \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
 	     pos = pos->next)
 
 /**
- * cds_hlist_for_each_entry_continue - iterate over a hlist continuing after current point
+ * hlist_for_each_entry_continue - iterate over a hlist continuing after current point
  * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct cds_hlist_node to use as a loop cursor.
- * @member:	the name of the cds_hlist_node within the struct.
+ * @pos:	the &struct hlist_node to use as a loop cursor.
+ * @member:	the name of the hlist_node within the struct.
  */
-#define cds_hlist_for_each_entry_continue(tpos, pos, member)		 \
+#define hlist_for_each_entry_continue(tpos, pos, member)		 \
 	for (pos = (pos)->next;						 \
 	     pos && ({ prefetch(pos->next); 1;}) &&			 \
-		({ tpos = cds_hlist_entry(pos, typeof(*tpos), member); 1;}); \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
 	     pos = pos->next)
 
 /**
- * cds_hlist_for_each_entry_from - iterate over a hlist continuing from current point
+ * hlist_for_each_entry_from - iterate over a hlist continuing from current point
  * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct cds_hlist_node to use as a loop cursor.
- * @member:	the name of the cds_hlist_node within the struct.
+ * @pos:	the &struct hlist_node to use as a loop cursor.
+ * @member:	the name of the hlist_node within the struct.
  */
-#define cds_hlist_for_each_entry_from(tpos, pos, member)			 \
+#define hlist_for_each_entry_from(tpos, pos, member)			 \
 	for (; pos && ({ prefetch(pos->next); 1;}) &&			 \
-		({ tpos = cds_hlist_entry(pos, typeof(*tpos), member); 1;}); \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
 	     pos = pos->next)
 
 /**
- * cds_hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
+ * hlist_for_each_entry_safe - iterate over list of given type safe against removal of list entry
  * @tpos:	the type * to use as a loop cursor.
- * @pos:	the &struct cds_hlist_node to use as a loop cursor.
- * @n:		another &struct cds_hlist_node to use as temporary storage
+ * @pos:	the &struct hlist_node to use as a loop cursor.
+ * @n:		another &struct hlist_node to use as temporary storage
  * @head:	the head for your list.
- * @member:	the name of the cds_hlist_node within the struct.
+ * @member:	the name of the hlist_node within the struct.
  */
-#define cds_hlist_for_each_entry_safe(tpos, pos, n, head, member) 		 \
+#define hlist_for_each_entry_safe(tpos, pos, n, head, member) 		 \
 	for (pos = (head)->first;					 \
 	     pos && ({ n = pos->next; 1; }) && 				 \
-		({ tpos = cds_hlist_entry(pos, typeof(*tpos), member); 1;}); \
+		({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
 	     pos = n)
 
 #endif
-- 
1.7.6