From: Ingo Molnar Date: Wed, 14 Feb 2024 09:48:28 +0000 (+0100) Subject: Merge branch 'x86/bugs' into x86/core, to pick up pending changes before dependent... X-Git-Tag: v6.9-rc1~186^2~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4589f199eb68afd462bd792f730c7936fe3dafb5;p=thirdparty%2Fkernel%2Flinux.git Merge branch 'x86/bugs' into x86/core, to pick up pending changes before dependent patches Merge in pending alternatives patching infrastructure changes, before applying more patches. Signed-off-by: Ingo Molnar --- 4589f199eb68afd462bd792f730c7936fe3dafb5 diff --cc arch/x86/include/asm/nospec-branch.h index 691ff1ef701b6,55754617eaee8..8bd8ed576f91f --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@@ -300,9 -309,9 +300,9 @@@ .macro CALL_DEPTH_ACCOUNT - #ifdef CONFIG_CALL_DEPTH_TRACKING + #ifdef CONFIG_MITIGATION_CALL_DEPTH_TRACKING ALTERNATIVE "", \ - __stringify(ASM_INCREMENT_CALL_DEPTH), X86_FEATURE_CALL_DEPTH + __stringify(INCREMENT_CALL_DEPTH), X86_FEATURE_CALL_DEPTH #endif .endm