diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-08-31 15:20:06 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-08-31 15:20:06 +0300 |
commit | 3e83dfd5d8e374328078f527f1f7d189824896ab (patch) | |
tree | 2f82b2e82f7a4b5c513fed42d4228a8bce938180 /arch/x86/entry/entry_64.S | |
parent | 3308376a914b9c3f57a12072c063814403d983a8 (diff) | |
parent | 9e52fc2b50de3a1c08b44f94c610fbe998c0031a (diff) | |
download | linux-3e83dfd5d8e374328078f527f1f7d189824896ab.tar.xz |
Merge branch 'x86/mm' into x86/platform, to pick up TLB flush dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry/entry_64.S')
-rw-r--r-- | arch/x86/entry/entry_64.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index d271fb79248f..6d078b89a5e8 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1211,6 +1211,8 @@ ENTRY(nmi) * other IST entries. */ + ASM_CLAC + /* Use %rdx as our temp variable throughout */ pushq %rdx |