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

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
...@@ -38,5 +38,4 @@ INDIRECT_THUNK(dx) ...@@ -38,5 +38,4 @@ INDIRECT_THUNK(dx)
INDIRECT_THUNK(si) INDIRECT_THUNK(si)
INDIRECT_THUNK(di) INDIRECT_THUNK(di)
INDIRECT_THUNK(bp) INDIRECT_THUNK(bp)
INDIRECT_THUNK(sp)
#endif /* CONFIG_RETPOLINE */ #endif /* CONFIG_RETPOLINE */
...@@ -36,7 +36,6 @@ GENERATE_THUNK(_ASM_DX) ...@@ -36,7 +36,6 @@ GENERATE_THUNK(_ASM_DX)
GENERATE_THUNK(_ASM_SI) GENERATE_THUNK(_ASM_SI)
GENERATE_THUNK(_ASM_DI) GENERATE_THUNK(_ASM_DI)
GENERATE_THUNK(_ASM_BP) GENERATE_THUNK(_ASM_BP)
GENERATE_THUNK(_ASM_SP)
#ifdef CONFIG_64BIT #ifdef CONFIG_64BIT
GENERATE_THUNK(r8) GENERATE_THUNK(r8)
GENERATE_THUNK(r9) GENERATE_THUNK(r9)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment