On Sun, 2014-04-06 at 22:16 +0200, Oleg Nesterov wrote:
> 1. Add the trivial sizeof_long() helper and change other callers of
> is_ia32_task() to use it.
>
...
This hunk #3 doesn't apply for me. I can't find in your patch sets
where you added the lines being replaced (and they weren't there
originally).
After I fixed up this hunk, this patch and the rest applied OK.
> @@ -450,10 +448,7 @@ static int default_post_xol_op(struct arch_uprobe
> *auprobe, struct pt_regs *regs
>
> if (auprobe->fixups & UPROBE_FIX_CALL) {
> if (adjust_ret_addr(regs->sp, correction)) {
> - if (is_ia32_task())
> - regs->sp += 4;
> - else
> - regs->sp += 8;
> + regs->sp += sizeof_long();
> return -ERESTART;
> }
> }
> @@ -738,23 +733,21 @@ if (ret) pr_crit("EMULATE: %lx -> %lx\n", ip, regs->ip);
...
This modified hunk worked for me.
@@ -450,7 +448,9 @@ static int default_post_xol_op(struct arch_uprobe *auprobe,
struct pt_regs *regs
if (auprobe->fixups & UPROBE_FIX_CALL) {
- if (adjust_ret_addr(regs->sp, correction))
+ if (adjust_ret_addr(regs->sp, correction)) {
+ regs->sp += sizeof_long();
return -ERESTART;
+ }
}
return 0;
Jim
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
