From: Nathan Chancellor <nathan@kernel.org>
To: Carlos Llamas <cmllamas@google.com>
Cc: Namhyung Kim <namhyung@kernel.org>,
Linus Walleij <linus.walleij@linaro.org>,
Kees Cook <kees@kernel.org>, Ingo Molnar <mingo@kernel.org>,
kernel-team@android.com, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] tools headers: kcfi: rename missed CONFIG_CFI_CLANG
Date: Mon, 6 Oct 2025 15:05:00 -0700 [thread overview]
Message-ID: <20251006220500.GC3234160@ax162> (raw)
In-Reply-To: <20251006184412.552339-1-cmllamas@google.com>
On Mon, Oct 06, 2025 at 06:43:57PM +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
Technically, this was correct when 23ef9d439769 committed:
$ git show 23ef9d439769:tools/include/linux/cfi_types.h | grep CONFIG_CFI
#ifdef CONFIG_CFI
#else /* CONFIG_CFI */
#endif /* CONFIG_CFI */
This is a cross tree collision, as
aa34642f6fc3 ("tools headers: Sync linux/cfi_types.h with the kernel source")
was merged in 6.17-rc4 via the perf tools tree but Kees's tree was based
on -rc2, so he did not have it. It only becomes a problem on the merge.
> 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: 23ef9d439769 ("kcfi: Rename CONFIG_CFI_CLANG to CONFIG_CFI")
With all that said, I think this fixes tag should really be:
Fixes: a5ba183bdeee ("Merge tag 'hardening-v6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux")
> Signed-off-by: Carlos Llamas <cmllamas@google.com>
Regardless, I think the fix is obviously correct.
Reviewed-by: Nathan Chancellor <nathan@kernel.org>
> ---
> 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
>
next prev parent reply other threads:[~2025-10-06 22:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-06 18:43 [PATCH] tools headers: kcfi: rename missed CONFIG_CFI_CLANG Carlos Llamas
2025-10-06 22:05 ` Nathan Chancellor [this message]
2025-10-06 22:46 ` Carlos Llamas
2025-10-06 22:51 ` [PATCH v2] " Carlos Llamas
2025-10-07 15:24 ` (subset) " Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251006220500.GC3234160@ax162 \
--to=nathan@kernel.org \
--cc=cmllamas@google.com \
--cc=kees@kernel.org \
--cc=kernel-team@android.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox