mm, slab: Remove compiler check in __kmalloc_index
authorNathan Chancellor <nathan@kernel.org>
Mon, 29 Nov 2021 16:57:59 +0000 (09:57 -0700)
committerMasahiro Yamada <masahiroy@kernel.org>
Thu, 2 Dec 2021 08:24:51 +0000 (17:24 +0900)
The minimum supported version of LLVM has been raised to 11.0.0, meaning
this check is always true, so it can be dropped.

Signed-off-by: Nathan Chancellor <nathan@kernel.org>
Reviewed-by: Miguel Ojeda <ojeda@kernel.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
include/linux/slab.h

index 1810451..d3fb5ac 100644 (file)
@@ -411,8 +411,7 @@ static __always_inline unsigned int __kmalloc_index(size_t size,
        if (size <=  16 * 1024 * 1024) return 24;
        if (size <=  32 * 1024 * 1024) return 25;
 
-       if ((IS_ENABLED(CONFIG_CC_IS_GCC) || CONFIG_CLANG_VERSION >= 110000)
-           && !IS_ENABLED(CONFIG_PROFILE_ALL_BRANCHES) && size_is_constant)
+       if (!IS_ENABLED(CONFIG_PROFILE_ALL_BRANCHES) && size_is_constant)
                BUILD_BUG_ON_MSG(1, "unexpected size in kmalloc_index()");
        else
                BUG();