Re: [PATCH 6.6] x86/its: Fix build error for its_static_thunk()

[Greg Kroah-Hartman <gregkh@linuxfoundation.org>]

On Mon, May 19, 2025 at 01:43:42PM -0700, Pawan Gupta wrote:
> Due to a likely merge resolution error of backport commit 772934d9062a
> ("x86/its: FineIBT-paranoid vs ITS"), the function its_static_thunk() was
> placed in the wrong ifdef block, causing a build error when
> CONFIG_MITIGATION_ITS and CONFIG_FINEIBT are both disabled:
> 
>   /linux-6.6/arch/x86/kernel/alternative.c:1452:5: error: redefinition of 'its_static_thunk'
>    1452 | u8 *its_static_thunk(int reg)
>         |     ^~~~~~~~~~~~~~~~
> 
> Fix it by moving its_static_thunk() under CONFIG_MITIGATION_ITS.
> 
> Reported-by: Natanael Copa <ncopa@alpinelinux.org>
> Link: https://lore.kernel.org/all/20250519164717.18738b4e@ncopa-desktop/
> Signed-off-by: Pawan Gupta <pawan.kumar.gupta@linux.intel.com>
> ---
> commit ("x86/its: FineIBT-paranoid vs ITS") was resolved correctly in
> v6.12:
> 
> https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.29&id=7e78061be78b8593df9b0cd0f21b1fee425035de
> 
> Fix is required in v6.6 and v6.1

Thanks for this, now queued up for 6.6.y, but I think 6.1.y is ok, as
this didn't apply there, nor did I get any build reports of problems for
it yet.  So I'll leave that be for now.

greg k-h