From 71c1cc5a19005a5818dc6705a0530c5ec51d4d94 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Wed, 5 Sep 2012 23:31:18 +0900 Subject: [PATCH] --- yaml --- r: 323821 b: refs/heads/master c: 47d5a5f88b9d25d6464c9b60c28f391e84e3ed65 h: refs/heads/master i: 323819: 312cdf4c6538bf28f7834a021ff655a03104d588 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/entry_64.S | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e275ebc4ec9d..9edf9c2cda20 100644 --- 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 index ed767b747fe5..e9cc2b32bdf4 100644 --- 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