From: Masami Hiramatsu Date: Wed, 5 Sep 2012 14:31:12 +0000 (+0900) Subject: kprobes/x86: Fix kprobes to collectly handle IP on ftrace X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~97^2~8^2~2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b036d54bf849a75d0103b33d92a53f89ecb9315;p=pandora-kernel.git kprobes/x86: Fix kprobes to collectly handle IP on ftrace Current kprobe_ftrace_handler expects regs->ip == ip, but it is incorrect (originally on x86-64). Actually, ftrace handler sets regs->ip = ip + MCOUNT_INSN_SIZE. kprobe_ftrace_handler must take care for that. Link: http://lkml.kernel.org/r/20120905143112.10329.72069.stgit@localhost.localdomain Cc: Peter Zijlstra Cc: Frederic Weisbecker Cc: Thomas Gleixner Cc: "H. Peter Anvin" Signed-off-by: Masami Hiramatsu Signed-off-by: Steven Rostedt --- Reading git-diff-tree failed