diff options
Diffstat (limited to 'kernel/kprobes.c')
-rw-r--r-- | kernel/kprobes.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 35b4315d84f5..098f396aa409 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c | |||
@@ -1418,9 +1418,6 @@ static __kprobes int check_kprobe_address_safe(struct kprobe *p, | |||
1418 | /* Given address is not on the instruction boundary */ | 1418 | /* Given address is not on the instruction boundary */ |
1419 | if ((unsigned long)p->addr != ftrace_addr) | 1419 | if ((unsigned long)p->addr != ftrace_addr) |
1420 | return -EILSEQ; | 1420 | return -EILSEQ; |
1421 | /* break_handler (jprobe) can not work with ftrace */ | ||
1422 | if (p->break_handler) | ||
1423 | return -EINVAL; | ||
1424 | p->flags |= KPROBE_FLAG_FTRACE; | 1421 | p->flags |= KPROBE_FLAG_FTRACE; |
1425 | #else /* !KPROBES_CAN_USE_FTRACE */ | 1422 | #else /* !KPROBES_CAN_USE_FTRACE */ |
1426 | return -EINVAL; | 1423 | return -EINVAL; |