diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-08-26 11:20:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-08-26 11:20:55 +0200 |
| commit | b3e30c9884407599353e690a4eb36d0c4671bf62 (patch) | |
| tree | d752d32d8a1a395cacd220313f24b933b2ed7294 /arch/x86/include/asm/nospec-branch.h | |
| parent | 342061c53a049569fc7f56d237753c26b4b2166d (diff) | |
| parent | a55aa89aab90fae7c815b0551b07be37db359d76 (diff) | |
Merge tag 'v5.3-rc6' into x86/cpu, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/nospec-branch.h')
| -rw-r--r-- | arch/x86/include/asm/nospec-branch.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index 109f974f9835..80bc209c0708 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h @@ -192,7 +192,7 @@ " lfence;\n" \ " jmp 902b;\n" \ " .align 16\n" \ - "903: addl $4, %%esp;\n" \ + "903: lea 4(%%esp), %%esp;\n" \ " pushl %[thunk_target];\n" \ " ret;\n" \ " .align 16\n" \ |