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>
---
v2:
 - Tag the correct fixes commit per Nathan.
 - Collect reviewed tags.

v1:
https://lore.kernel.org/all/20251006184412.552339-1-cmllamas@google.com/

 tools/include/linux/cfi_types.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/include/linux/cfi_types.h b/tools/include/linux/cfi_types.h
index fb8d90bff92e..a86af9bc8bdc 100644
--- a/tools/include/linux/cfi_types.h
+++ b/tools/include/linux/cfi_types.h
@@ -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		\
-- 
2.51.0.618.g983fd99d29-goog

On Mon, 06 Oct 2025 22:51:32 +0000, Carlos Llamas wrote:
> 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
> 
> [...]

Applied to for-next/hardening, thanks!

[1/1] tools headers: kcfi: rename missed CONFIG_CFI_CLANG
      https://git.kernel.org/kees/c/b157dd228cf0

Take care,

-- 
Kees Cook