---

yaml --- r: 323821 b: refs/heads/master c: 47d5a5f h: refs/heads/master i: 323819: 312cdf4 v: v3
git-mirror · Sep 14, 2012 · 71c1cc5 · 71c1cc5
1 parent facbe2c
commit 71c1cc5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b036d54bf849a75d0103b33d92a53f89ecb9315
+refs/heads/master: 47d5a5f88b9d25d6464c9b60c28f391e84e3ed65
diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S
@@ -165,6 +165,10 @@ GLOBAL(ftrace_regs_call)
 	movq EFLAGS(%rsp), %rax
 	movq %rax, SS(%rsp)
 
+	/* Handlers can change the RIP */
+	movq RIP(%rsp), %rax
+	movq %rax, SS+8(%rsp)
+
 	/* restore the rest of pt_regs */
 	movq R15(%rsp), %r15
 	movq R14(%rsp), %r14