aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/kernel/entry_64.S3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index b6b2e85454cf..20dc8e6b6d80 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -310,9 +310,10 @@ ENDPROC(native_usergs_sysret64)
310 movq_cfi r10, R10-RBP 310 movq_cfi r10, R10-RBP
311 movq_cfi r11, R11-RBP 311 movq_cfi r11, R11-RBP
312 312
313 leaq -RBP(%rsp),%rdi /* arg1 for handler */
314 movq_cfi rbp, 0 /* push %rbp */ 313 movq_cfi rbp, 0 /* push %rbp */
315 movq %rsp, %rbp 314 movq %rsp, %rbp
315
316 leaq -RBP(%rsp),%rdi /* arg1 for handler */
316 testl $3, CS(%rdi) 317 testl $3, CS(%rdi)
317 je 1f 318 je 1f
318 SWAPGS 319 SWAPGS