tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 24b1cccf 32c6cdf7

-2
-1
arch/x86/include/asm/asm-prototypes.h
··· 38 38 INDIRECT_THUNK(si) 39 39 INDIRECT_THUNK(di) 40 40 INDIRECT_THUNK(bp) 41 - INDIRECT_THUNK(sp) 42 41 #endif /* CONFIG_RETPOLINE */
-1
arch/x86/lib/retpoline.S
··· 36 36 GENERATE_THUNK(_ASM_SI) 37 37 GENERATE_THUNK(_ASM_DI) 38 38 GENERATE_THUNK(_ASM_BP) 39 - GENERATE_THUNK(_ASM_SP) 40 39 #ifdef CONFIG_64BIT 41 40 GENERATE_THUNK(r8) 42 41 GENERATE_THUNK(r9)