Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6027c81 authored by Jann Horn's avatar Jann Horn Committed by Borislav Petkov
Browse files

x86/cpufeature: Fix __percpu annotation in this_cpu_has() 



&cpu_info.x86_capability is __percpu, and the second argument of
x86_this_cpu_test_bit() is expected to be __percpu. Don't cast the
__percpu away and then implicitly add it again. This gets rid of 106
lines of sparse warnings with the kernel config I'm using.

Signed-off-by: default avatarJann Horn <jannh@google.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Cc: Nadav Amit <namit@vmware.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20190328154948.152273-1-jannh@google.com
parent 92c77f7c

arch/x86/include/asm/cpufeature.h

+3 −2
Original line number Diff line number Diff line
@@ -113,7 +113,8 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 


#define this_cpu_has(bit)						\

	(__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 :	\

	 x86_this_cpu_test_bit(bit, (unsigned long *)&cpu_info.x86_capability))

	 x86_this_cpu_test_bit(bit,					\

		(unsigned long __percpu *)&cpu_info.x86_capability))



/*

 * This macro is for detection of features which need kernel