2 files changed, 27 insertions, 6 deletions

diff --git a/lib/debugobjects.c b/lib/debugobjects.c
index 0ab9ae8057f0..d11808ca4bc4 100644
--- a/lib/debugobjects.c
+++ b/lib/debugobjects.c
@@ -79,30 +79,29 @@ static const char *obj_states[ODEBUG_STATE_MAX] = {
         [ODEBUG_STATE_NOTAVAILABLE]     = "not available",
 };
 
-static int fill_pool(void)
+static void fill_pool(void)
 {
         gfp_t gfp = GFP_ATOMIC | __GFP_NORETRY | __GFP_NOWARN;
         struct debug_obj *new;
         unsigned long flags;
 
         if (likely(obj_pool_free >= ODEBUG_POOL_MIN_LEVEL))
-                return obj_pool_free;
+                return;
 
         if (unlikely(!obj_cache))
-                return obj_pool_free;
+                return;
 
         while (obj_pool_free < ODEBUG_POOL_MIN_LEVEL) {
 
                 new = kmem_cache_zalloc(obj_cache, gfp);
                 if (!new)
-                        return obj_pool_free;
+                        return;
 
                 raw_spin_lock_irqsave(&pool_lock, flags);
                 hlist_add_head(&new->node, &obj_pool);
                 obj_pool_free++;
                 raw_spin_unlock_irqrestore(&pool_lock, flags);
         }
-        return obj_pool_free;
 }
 
 /*
@@ -1052,10 +1051,10 @@ static int __init debug_objects_replace_static_objects(void)
                         cnt++;
                 }
         }
+        local_irq_enable();
 
         printk(KERN_DEBUG "ODEBUG: %d of %d active objects replaced\n", cnt,
                obj_pool_used);
-        local_irq_enable();
         return 0;
 free:
         hlist_for_each_entry_safe(obj, node, tmp, &objects, node) {
diff --git a/lib/list_debug.c b/lib/list_debug.c
index 982b850d4e7a..3810b481f940 100644
--- a/lib/list_debug.c
+++ b/lib/list_debug.c
@@ -10,6 +10,7 @@
 #include <linux/list.h>
 #include <linux/bug.h>
 #include <linux/kernel.h>
+#include <linux/rculist.h>
 
 /*
  * Insert a new entry between two known consecutive entries.
@@ -75,3 +76,24 @@ void list_del(struct list_head *entry)
         entry->prev = LIST_POISON2;
 }
 EXPORT_SYMBOL(list_del);
+
+/*
+ * RCU variants.
+ */
+void __list_add_rcu(struct list_head *new,
+                    struct list_head *prev, struct list_head *next)
+{
+        WARN(next->prev != prev,
+                "list_add_rcu corruption. next->prev should be "
+                "prev (%p), but was %p. (next=%p).\n",
+                prev, next->prev, next);
+        WARN(prev->next != next,
+                "list_add_rcu corruption. prev->next should be "
+                "next (%p), but was %p. (prev=%p).\n",
+                next, prev->next, prev);
+        new->next = next;
+        new->prev = prev;
+        rcu_assign_pointer(list_next_rcu(prev), new);
+        next->prev = new;
+}
+EXPORT_SYMBOL(__list_add_rcu);