openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2018-01-28 12:24:36 -08:00
parent 32c6cdf75c 1df37383a8
commit 24b1cccf92
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/asm-prototypes.h
View File

@ -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 */

1
arch/x86/lib/retpoline.S
View File

@ -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)