From: Andi Kleen <[email protected]> X86_FEATURE_RETPOLINE has been renamed to X86_FEATURE_RETPOLINE_GENERIC. Convert the sequences using it.
Signed-off-by: Andi Kleen <[email protected]> --- arch/x86/entry/entry_32.S | 2 +- arch/x86/entry/entry_64.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index d2ef7f32905b..b3e4a2e35877 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -258,7 +258,7 @@ ENTRY(__switch_to_asm) * any calls on the new stack, and this can be difficult to * ensure in a complex C function like __switch_to. */ - ALTERNATIVE "", "FILL_RETURN_BUFFER %ebx", X86_FEATURE_RETPOLINE + ALTERNATIVE "", "FILL_RETURN_BUFFER %ebx", X86_FEATURE_RETPOLINE_GENERIC #endif /* restore callee-saved registers */ diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 58dbf7a12a05..566734018d76 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -501,7 +501,7 @@ ENTRY(__switch_to_asm) * any calls on the new stack, and this can be difficult to * ensure in a complex C function like __switch_to. */ - ALTERNATIVE "", "FILL_RETURN_BUFFER %r12", X86_FEATURE_RETPOLINE + ALTERNATIVE "", "FILL_RETURN_BUFFER %r12", X86_FEATURE_RETPOLINE_GENERIC #endif /* restore callee-saved registers */ -- 2.14.3
