summaryrefslogtreecommitdiffstats
path: root/lib/llist.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/llist.c')
-rw-r--r--lib/llist.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/llist.c b/lib/llist.c
index b445f2c8596a..6c69f1d14c4b 100644
--- a/lib/llist.c
+++ b/lib/llist.c
@@ -41,11 +41,14 @@ void llist_add_batch(struct llist_node *new_first, struct llist_node *new_last,
struct llist_node *entry, *old_entry;
entry = head->first;
- do {
+ for (;;) {
old_entry = entry;
new_last->next = entry;
+ entry = cmpxchg(&head->first, old_entry, new_first);
+ if (entry == old_entry)
+ break;
cpu_relax();
- } while ((entry = cmpxchg(&head->first, old_entry, new_first)) != old_entry);
+ }
}
EXPORT_SYMBOL_GPL(llist_add_batch);
@@ -68,13 +71,16 @@ struct llist_node *llist_del_first(struct llist_head *head)
struct llist_node *entry, *old_entry, *next;
entry = head->first;
- do {
+ for (;;) {
if (entry == NULL)
return NULL;
old_entry = entry;
next = entry->next;
+ entry = cmpxchg(&head->first, old_entry, next);
+ if (entry == old_entry)
+ break;
cpu_relax();
- } while ((entry = cmpxchg(&head->first, old_entry, next)) != old_entry);
+ }
return entry;
}