Commit 70cce264 authored by Pawan Gupta's avatar Pawan Gupta Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: x86/its: Fix build error for its_static_thunk()



Due to a likely merge resolution error of backport commit 772934d9
("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.

Fixes: e52c1dc7 ("x86/its: FineIBT-paranoid vs ITS")
Reported-by: default avatarNatanael Copa <ncopa@alpinelinux.org>
Link: https://lore.kernel.org/all/20250519164717.18738b4e@ncopa-desktop/


Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Change-Id: I0349a1b0fc160fe2e15a6d485ca0fe5310f69c1f
Signed-off-by: default avatarPawan Gupta <pawan.kumar.gupta@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit e24073cd)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 195969c1
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment