Revert "gcov: clang: fix clang-11+ build"
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Apr 2021 22:08:49 +0000 (15:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Apr 2021 22:08:49 +0000 (15:08 -0700)
This reverts commit 04c53de57cb6435738961dace8b1b71d3ecd3c39.

Nathan Chancellor points out that it should not have been merged into
mainline by itself. It was a fix for "gcov: use kvmalloc()", which is
still in -mm/-next. Merging it alone has broken the build.

Link: https://github.com/ClangBuiltLinux/continuous-integration2/runs/2384465683?check_suite_focus=true
Reported-by: Nathan Chancellor <nathan@kernel.org>
Cc: Johannes Berg <johannes.berg@intel.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
kernel/gcov/clang.c

index b81f2823630d74fc152256381f1803d98a8044b9..c466c7fbdece557de01f448b4584bd563fa2ee09 100644 (file)
@@ -369,7 +369,7 @@ static struct gcov_fn_info *gcov_fn_info_dup(struct gcov_fn_info *fn)
        INIT_LIST_HEAD(&fn_dup->head);
 
        cv_size = fn->num_counters * sizeof(fn->counters[0]);
-       fn_dup->counters = kvmalloc(cv_size, GFP_KERNEL);
+       fn_dup->counters = vmalloc(cv_size);
        if (!fn_dup->counters) {
                kfree(fn_dup);
                return NULL;