summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/list_sort.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/list_sort.c b/lib/list_sort.c
index a34c78c30d56..6b9fdaf1d32e 100644
--- a/lib/list_sort.c
+++ b/lib/list_sort.c
@@ -47,6 +47,7 @@ static void merge_and_restore_back_links(void *priv,
47 struct list_head *a, struct list_head *b) 47 struct list_head *a, struct list_head *b)
48{ 48{
49 struct list_head *tail = head; 49 struct list_head *tail = head;
50 u8 count = 0;
50 51
51 while (a && b) { 52 while (a && b) {
52 /* if equal, take 'a' -- important for sort stability */ 53 /* if equal, take 'a' -- important for sort stability */
@@ -70,7 +71,8 @@ static void merge_and_restore_back_links(void *priv,
70 * element comparison is needed, so the client's cmp() 71 * element comparison is needed, so the client's cmp()
71 * routine can invoke cond_resched() periodically. 72 * routine can invoke cond_resched() periodically.
72 */ 73 */
73 (*cmp)(priv, tail->next, tail->next); 74 if (unlikely(!(++count)))
75 (*cmp)(priv, tail->next, tail->next);
74 76
75 tail->next->prev = tail; 77 tail->next->prev = tail;
76 tail = tail->next; 78 tail = tail->next;