Commit 7af08140 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "gcov: clang: fix clang-11+ build" 

This reverts commit 04c53de5.

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: default avatarNathan 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: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bf05bf16

kernel/gcov/clang.c

+1 −1
Original line number Diff line number Diff line
@@ -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;