Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[linux-imx.git] / lib / llist.c

diff --git a/lib/llist.c b/lib/llist.c
index 8221b3d2fbf0dc1f5356de339ed6c70071ba0a1f..4a70d120138cc684eb633ad93c8abedea826b20d 100644 (file)
--- a/lib/llist.c
+++ b/lib/llist.c
@@ -27,7 +27,6 @@
 #include <linux/interrupt.h>
 #include <linux/llist.h>
 
-#include <asm/system.h>
 
 /**
  * llist_add_batch - add several linked entries in batch
@@ -40,18 +39,13 @@
 bool llist_add_batch(struct llist_node *new_first, struct llist_node *new_last,
                     struct llist_head *head)
 {
-       struct llist_node *entry, *old_entry;
+       struct llist_node *first;
 
-       entry = head->first;
-       for (;;) {
-               old_entry = entry;
-               new_last->next = entry;
-               entry = cmpxchg(&head->first, old_entry, new_first);
-               if (entry == old_entry)
-                       break;
-       }
+       do {
+               new_last->next = first = ACCESS_ONCE(head->first);
+       } while (cmpxchg(&head->first, first, new_first) != first);
 
-       return old_entry == NULL;
+       return !first;
 }
 EXPORT_SYMBOL_GPL(llist_add_batch);