[tip: locking/kcsan] compiler_types.h: Use unoptimized __unqual_scalar_typeof for sparse

[tip-bot2 for Marco Elver]

The following commit has been merged into the locking/kcsan branch of tip:

Commit-ID:     f05e1242fbb2d149ceaa87310cf67d03fe007a25
Gitweb:        https://git.kernel.org/tip/f05e1242fbb2d149ceaa87310cf67d03fe007a25
Author:        Marco Elver <elver@xxxxxxxxxx>
AuthorDate:    Thu, 28 May 2020 09:43:13 +02:00
Committer:     Borislav Petkov <bp@xxxxxxx>
CommitterDate: Thu, 28 May 2020 11:51:38 +02:00

compiler_types.h: Use unoptimized __unqual_scalar_typeof for sparse

If the file is being checked with sparse, use the unoptimized version of
__unqual_scalar_typeof(), since sparse does not support _Generic.

Reported-by: kbuild test robot <lkp@xxxxxxxxx>
Signed-off-by: Marco Elver <elver@xxxxxxxxxx>
Signed-off-by: Borislav Petkov <bp@xxxxxxx>
Link: https://lkml.kernel.org/r/202005280727.lXn1VnTw%lkp@xxxxxxxxx
---
 include/linux/compiler_types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
index a529fa2..c1ee208 100644
--- a/include/linux/compiler_types.h
+++ b/include/linux/compiler_types.h
@@ -246,7 +246,7 @@ struct ftrace_likely_data {
  * __unqual_scalar_typeof(x) - Declare an unqualified scalar type, leaving
  *			       non-scalar types unchanged.
  */
-#if defined(CONFIG_CC_IS_GCC) && CONFIG_GCC_VERSION < 40900
+#if (defined(CONFIG_CC_IS_GCC) && CONFIG_GCC_VERSION < 40900) || defined(__CHECKER__)
 /*
  * We build this out of a couple of helper macros in a vain attempt to
  * help you keep your lunch down while reading it.