A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 07:03:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "lib/list_sort: fix function type mismatches"

Browse source
This commit is contained in:
qctecmdr 2020-02-18 00:46:01 -08:00 • committed by Gerrit - the friendly Code Review server
commit 72bd5c7146
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/list_sort.c
View file

@ -8,7 +8,7 @@
#include <linux/list.h>
typedef int __attribute__((nonnull(2,3))) (*cmp_func)(void *,
struct list_head const *, struct list_head const *);
struct list_head *, struct list_head *);
/*
* Returns a list organized in an intermediate format suited
@ -227,7 +227,7 @@ void list_sort(void *priv, struct list_head *head,
if (likely(bits)) {
struct list_head *a = *tail, *b = a->prev;
a = merge(priv, (cmp_func)cmp, b, a);
a = merge(priv, cmp, b, a);
/* Install the merged result in place of the inputs */
a->prev = b->prev;
*tail = a;
@ -249,7 +249,7 @@ void list_sort(void *priv, struct list_head *head,
if (!next)
break;
list = merge(priv, (cmp_func)cmp, pending, list);
list = merge(priv, cmp, pending, list);
pending = next;
}
/* The final merge, rebuilding prev links */