summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Poimboeuf <jpoimboe@redhat.com>2014-12-22 13:39:54 +0100
committerJiri Kosina <jkosina@suse.cz>2014-12-22 20:05:59 +0100
commit33e8612f64d4973ae3617a01224ec02b7b879597 (patch)
treebcaceb6ab504869d4eedf46b549c963bf9b1e19c
parentb5bfc51707f1b56b0b733980bb4fcc0562bf02d8 (diff)
downloadlinux-33e8612f64d4973ae3617a01224ec02b7b879597.tar.gz
livepatch: use FTRACE_OPS_FL_IPMODIFY
Use the FTRACE_OPS_FL_IPMODIFY flag to prevent conflicts with other ftrace users who also modify regs->ip. Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> Reviewed-by: Petr Mladek <pmladek@suse.cz> Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--kernel/livepatch/core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/livepatch/core.c b/kernel/livepatch/core.c
index 07a2db9d01e6..6f6387912da7 100644
--- a/kernel/livepatch/core.c
+++ b/kernel/livepatch/core.c
@@ -641,7 +641,8 @@ static int klp_init_func(struct klp_object *obj, struct klp_func *func)
ops->private = func;
ops->func = klp_ftrace_handler;
- ops->flags = FTRACE_OPS_FL_SAVE_REGS | FTRACE_OPS_FL_DYNAMIC;
+ ops->flags = FTRACE_OPS_FL_SAVE_REGS | FTRACE_OPS_FL_DYNAMIC |
+ FTRACE_OPS_FL_IPMODIFY;
func->fops = ops;
func->state = KLP_DISABLED;