diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-24 10:12:33 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-24 10:12:33 +0200 |
| commit | 93da8b221da95a97316e518c94f03856e5d610a9 (patch) | |
| tree | 23787f3c0d02507f20d804aac23ef209d66a7586 /arch/x86/entry | |
| parent | Merge tag 'perf-core-for-mingo-4.14-20170821' of git://git.kernel.org/pub/scm... (diff) | |
| parent | Revert "pty: fix the cached path of the pty slave file descriptor in the master" (diff) | |
| download | linux-93da8b221da95a97316e518c94f03856e5d610a9.tar.xz linux-93da8b221da95a97316e518c94f03856e5d610a9.zip | |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry')
| -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 3e3da2928c44..ce8dc33dd640 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1206,6 +1206,8 @@ ENTRY(nmi) * other IST entries. */ + ASM_CLAC + /* Use %rdx as our temp variable throughout */ pushq %rdx |