]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
tools headers: kcfi: rename missed CONFIG_CFI_CLANG
authorCarlos Llamas <cmllamas@google.com>
Mon, 6 Oct 2025 22:51:32 +0000 (22:51 +0000)
committerKees Cook <kees@kernel.org>
Tue, 7 Oct 2025 15:21:33 +0000 (08:21 -0700)
Commit 23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG to CONFIG_CFI")
missed one instance of CONFIG_CFI_CLANG. Rename it to match the original
kernel header. This addresses the following build warning:

  Warning: Kernel ABI header differences:
    diff -u tools/include/linux/cfi_types.h include/linux/cfi_types.h

Cc: Kees Cook <kees@kernel.org>
Fixes: a5ba183bdeee ("Merge tag 'hardening-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux")
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
Signed-off-by: Carlos Llamas <cmllamas@google.com>
Link: https://lore.kernel.org/r/20251006225148.1636486-1-cmllamas@google.com
Signed-off-by: Kees Cook <kees@kernel.org>
tools/include/linux/cfi_types.h

index fb8d90bff92e0ca87715cc0a789b9b3dc18658d0..a86af9bc8bdc4781e4d30f2b230d84a96e4e02ac 100644 (file)
@@ -43,7 +43,7 @@
 
 #else /* __ASSEMBLY__ */
 
-#ifdef CONFIG_CFI_CLANG
+#ifdef CONFIG_CFI
 #define DEFINE_CFI_TYPE(name, func)                                            \
        /*                                                                      \
         * Force a reference to the function so the compiler generates          \