diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-25 16:26:42 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-25 16:26:42 -0800 |
commit | 13e1ad2be3a85f5c0f76e82af9806b3d12a574d0 (patch) | |
tree | db693bd41dbea4d361477175c7431cd4fb5c2bab /arch/arm64/kernel/ftrace.c | |
parent | 9f687dddc4e1a3101f1ceb7fbaddbf93f93a7788 (diff) | |
parent | 20c3a2c33e9fdc82e9e8e8d2a6445b3256d20191 (diff) | |
download | linux-13e1ad2be3a85f5c0f76e82af9806b3d12a574d0.tar.bz2 |
Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 pti updates from Thomas Gleixner:
"No point in speculating what's in this parcel:
- Drop the swap storage limit when L1TF is disabled so the full space
is available
- Add support for the new AMD STIBP always on mitigation mode
- Fix a bunch of STIPB typos"
* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/speculation: Add support for STIBP always-on preferred mode
x86/speculation/l1tf: Drop the swap storage limit restriction when l1tf=off
x86/speculation: Change misspelled STIPB to STIBP
Diffstat (limited to 'arch/arm64/kernel/ftrace.c')
0 files changed, 0 insertions, 0 deletions