Revert "x86/alternative: Make custom return thunk unconditional"

Browse source

This reverts commit 53ebbe1c8c.

Revert the backport of upstream commit:

  095b8303f3 ("x86/alternative: Make custom return thunk unconditional")

in order to backport the full version now that

  770ae1b709 ("x86/returnthunk: Allow different return thunks")

has been backported.

Revert it here so that the build breakage is kept at minimum.

Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

...

This commit is contained in:

Borislav Petkov (AMD) 2024-02-24 12:01:34 +01:00 • committed by Greg Kroah-Hartman

parent 1221b8ea25

commit b012dcf39d

2 changed files with 0 additions and 6 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

arch/x86/include/asm/nospec-branch.h

View file

2

arch/x86/kernel/cpu/bugs.c

View file