From a50b8e03c99b401fcc507e7c6bf346ccb59af69e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Fri, 17 Jul 2020 14:35:14 +0200 Subject: [PATCH] Revert "FROMLIST: lib/list_sort: fix function type mismatches" This reverts commit 9b177a7d1cea8d43ddec29c85dc997548c1b9dcc as CFI is being removed from the tree to come back later as a "clean" set of patches. Bug: 147506196 Cc: Sami Tolvanen Cc: Todd Kjos Signed-off-by: Greg Kroah-Hartman Change-Id: Ie9d1c57c4b1e493aaf1f4654a188c830a414d97f --- lib/list_sort.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/list_sort.c b/lib/list_sort.c index b14accf4ef83..52f0c258c895 100644 --- a/lib/list_sort.c +++ b/lib/list_sort.c @@ -8,7 +8,7 @@ #include typedef int __attribute__((nonnull(2,3))) (*cmp_func)(void *, - struct list_head *, struct list_head *); + struct list_head const *, struct list_head const *); /* * 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, b, a); + a = merge(priv, (cmp_func)cmp, b, a); /* Install the merged result in place of the inputs */ a->prev = b->prev; *tail = a; @@ -249,10 +249,10 @@ void list_sort(void *priv, struct list_head *head, if (!next) break; - list = merge(priv, cmp, pending, list); + list = merge(priv, (cmp_func)cmp, pending, list); pending = next; } /* The final merge, rebuilding prev links */ - merge_final(priv, cmp, head, pending, list); + merge_final(priv, (cmp_func)cmp, head, pending, list); } EXPORT_SYMBOL(list_sort);