move sorted list functionality into litmus.h

2 files changed, 28 insertions, 30 deletions

diff --git a/include/linux/list.h b/include/linux/list.h
index 319c5eda13..611059d633 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -898,36 +898,6 @@ static inline void hlist_add_after_rcu(struct hlist_node *prev,
                 ({ tpos = hlist_entry(pos, typeof(*tpos), member); 1;}); \
              pos = pos->next)
 
-
-typedef int (*list_cmp_t)(struct list_head*, struct list_head*);
-
-static inline unsigned int list_insert(struct list_head* new,
-                                       struct list_head* head,
-                                       list_cmp_t order_before)
-{
-        struct list_head *pos;
-        unsigned int passed = 0;
-
-        BUG_ON(!new);
-
-        /* find a spot where the new entry is less than the next */
-        list_for_each(pos, head) {              
-                if (unlikely(order_before(new, pos))) {
-                        /* pos is not less than new, thus insert here */
-                        __list_add(new, pos->prev, pos);
-                        goto out;
-                }
-                passed++;
-        }
-        /* if we get to this point either the list is empty or every entry
-         * queued element is less than new.
-         * Let's add new to the end. */
-        list_add_tail(new, head);
- out:
-        return passed;  
-}
-
-
 #else
 #warning "don't include kernel headers in userspace"
 #endif /* __KERNEL__ */
diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 6373a37da3..de99addbce 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -77,6 +77,34 @@ static inline int in_list(struct list_head* list)
                 );
 }
 
+typedef int (*list_cmp_t)(struct list_head*, struct list_head*);
+
+static inline unsigned int list_insert(struct list_head* new,
+                                       struct list_head* head,
+                                       list_cmp_t order_before)
+{
+        struct list_head *pos;
+        unsigned int passed = 0;
+
+        BUG_ON(!new);
+
+        /* find a spot where the new entry is less than the next */
+        list_for_each(pos, head) {
+                if (unlikely(order_before(new, pos))) {
+                        /* pos is not less than new, thus insert here */
+                        __list_add(new, pos->prev, pos);
+                        goto out;
+                }
+                passed++;
+        }
+        /* if we get to this point either the list is empty or every entry
+         * queued element is less than new.
+         * Let's add new to the end. */
+        list_add_tail(new, head);
+ out:
+        return passed;
+}
+
 void list_qsort(struct list_head* list, list_cmp_t less_than);