Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24b1cccf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 retpoline fixlet from Thomas Gleixner:
 "Remove the ESP/RSP thunks for retpoline as they cannot ever work.

  Get rid of them before they show up in a release"

* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/retpoline: Remove the esp/rsp thunk
parents 32c6cdf7 1df37383

arch/x86/include/asm/asm-prototypes.h

+0 −1
Original line number Diff line number Diff line
@@ -38,5 +38,4 @@ INDIRECT_THUNK(dx) 
INDIRECT_THUNK(si)

INDIRECT_THUNK(di)

INDIRECT_THUNK(bp)

INDIRECT_THUNK(sp)

#endif /* CONFIG_RETPOLINE */

arch/x86/lib/retpoline.S

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ GENERATE_THUNK(_ASM_DX) 
GENERATE_THUNK(_ASM_SI)

GENERATE_THUNK(_ASM_DI)

GENERATE_THUNK(_ASM_BP)

GENERATE_THUNK(_ASM_SP)

#ifdef CONFIG_64BIT

GENERATE_THUNK(r8)

GENERATE_THUNK(r9)