diff options
author | Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> | 2015-01-05 06:29:32 -0500 |
---|---|---|
committer | Jon Medhurst <tixy@linaro.org> | 2015-01-13 11:10:16 -0500 |
commit | cbf6ab52add20b845f903decc973afbd5463c527 (patch) | |
tree | ea3dd11ef2a4f68aaf531038127aeee55c38db75 /kernel/kprobes.c | |
parent | 8d257e95a9e643518e72232bf852b054a3d06c95 (diff) |
kprobes: Pass the original kprobe for preparing optimized kprobe
Pass the original kprobe for preparing an optimized kprobe arch-dep
part, since for some architecture (e.g. ARM32) requires the information
in original kprobe.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'kernel/kprobes.c')
-rw-r--r-- | kernel/kprobes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 06f58309fed2..bad4e959f2f7 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c | |||
@@ -717,7 +717,7 @@ static void prepare_optimized_kprobe(struct kprobe *p) | |||
717 | struct optimized_kprobe *op; | 717 | struct optimized_kprobe *op; |
718 | 718 | ||
719 | op = container_of(p, struct optimized_kprobe, kp); | 719 | op = container_of(p, struct optimized_kprobe, kp); |
720 | arch_prepare_optimized_kprobe(op); | 720 | arch_prepare_optimized_kprobe(op, p); |
721 | } | 721 | } |
722 | 722 | ||
723 | /* Allocate new optimized_kprobe and try to prepare optimized instructions */ | 723 | /* Allocate new optimized_kprobe and try to prepare optimized instructions */ |
@@ -731,7 +731,7 @@ static struct kprobe *alloc_aggr_kprobe(struct kprobe *p) | |||
731 | 731 | ||
732 | INIT_LIST_HEAD(&op->list); | 732 | INIT_LIST_HEAD(&op->list); |
733 | op->kp.addr = p->addr; | 733 | op->kp.addr = p->addr; |
734 | arch_prepare_optimized_kprobe(op); | 734 | arch_prepare_optimized_kprobe(op, p); |
735 | 735 | ||
736 | return &op->kp; | 736 | return &op->kp; |
737 | } | 737 | } |