From 6981e7d30229976f992a4587124a086d65032c14 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Fri, 1 Jul 2011 02:25:17 +0200 Subject: [PATCH] --- yaml --- r: 257086 b: refs/heads/master c: 3b99a3ef55b292180473a221f3d6bc24455f0632 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/entry_64.S | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d27997834b50..0f8f05bf88ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1871853f7abc3c727c4346539c5062cbeaf016a4 +refs/heads/master: 3b99a3ef55b292180473a221f3d6bc24455f0632 diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S index b6b2e85454cf..20dc8e6b6d80 100644 --- a/trunk/arch/x86/kernel/entry_64.S +++ b/trunk/arch/x86/kernel/entry_64.S @@ -310,9 +310,10 @@ ENDPROC(native_usergs_sysret64) movq_cfi r10, R10-RBP movq_cfi r11, R11-RBP - leaq -RBP(%rsp),%rdi /* arg1 for handler */ movq_cfi rbp, 0 /* push %rbp */ movq %rsp, %rbp + + leaq -RBP(%rsp),%rdi /* arg1 for handler */ testl $3, CS(%rdi) je 1f SWAPGS