diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-12 12:10:03 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-12 12:10:03 +0100 |
| commit | 3c76db70eb70a0fbd40b3e0dec8f69ca344d1ff8 (patch) | |
| tree | a9dd314ac18992cdc2c50d4de60535a1b76ee351 /arch/x86/entry/entry_32.S | |
| parent | 194a9749c73d650c0b1dfdee04fb0bdf0a888ba8 (diff) | |
| parent | 7958b2246fadf54b7ff820a2a5a2c5ca1554716f (diff) | |
| download | linux-3c76db70eb70a0fbd40b3e0dec8f69ca344d1ff8.tar.bz2 | |
Merge branch 'x86/pti' into x86/mm, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry/entry_32.S')
| -rw-r--r-- | arch/x86/entry/entry_32.S | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index 16c2c022540d..6ad064c8cf35 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -252,8 +252,7 @@ ENTRY(__switch_to_asm) * exist, overwrite the RSB with entries which capture * speculative execution to prevent attack. */ - /* Clobbers %ebx */ - FILL_RETURN_BUFFER RSB_CLEAR_LOOPS, X86_FEATURE_RSB_CTXSW + FILL_RETURN_BUFFER %ebx, RSB_CLEAR_LOOPS, X86_FEATURE_RSB_CTXSW #endif /* restore callee-saved registers */ |