---

yaml --- r: 257086 b: refs/heads/master c: 3b99a3e h: refs/heads/master v: v3
git-mirror · Jul 2, 2011 · 6981e7d · 6981e7d
1 parent 20f1a88
commit 6981e7d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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