diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2007-10-21 16:34:49 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2007-10-21 16:34:49 -0400 |
| commit | 24993e4fcae48ca014e6b53f3f9a011c9cfa8f06 (patch) | |
| tree | 90080b050ab62e79e7d111cc764a75dba91ad485 /runtime/uprobes/uprobes.c | |
| parent | 11088605d9c0ab753e613b9ae52b6e59948cfc83 (diff) | |
| parent | f994dd4997067ca69b3b10ff8fa1547987aed585 (diff) | |
| download | systemtap-steved-24993e4fcae48ca014e6b53f3f9a011c9cfa8f06.tar.gz systemtap-steved-24993e4fcae48ca014e6b53f3f9a011c9cfa8f06.tar.xz systemtap-steved-24993e4fcae48ca014e6b53f3f9a011c9cfa8f06.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'runtime/uprobes/uprobes.c')
| -rw-r--r-- | runtime/uprobes/uprobes.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/uprobes/uprobes.c b/runtime/uprobes/uprobes.c index 01b40670..9f5fddd0 100644 --- a/runtime/uprobes/uprobes.c +++ b/runtime/uprobes/uprobes.c @@ -251,7 +251,7 @@ static void insert_bkpt(struct uprobe_probept *ppt, struct task_struct *tsk) goto out; } - if ((result = arch_validate_probed_insn(ppt)) < 0) { + if ((result = arch_validate_probed_insn(ppt, tsk)) < 0) { bkpt_insertion_failed(ppt, "instruction type cannot be probed"); goto out; } @@ -1754,7 +1754,8 @@ static int utask_quiesce_pending_sigtrap(struct uprobe_task *utask) if (unlikely(regset == NULL)) return -EIO; - if ((*regset->get)(utask->tsk, regset, SLOT_IP * regset->size, + if ((*regset->get)(utask->tsk, regset, + SLOT_IP(utask->tsk) * regset->size, regset->size, &insn_ptr, NULL) != 0) return -EIO; |