From 8d4362a2b33bc0f18e4621e53bf79c0f69f0491d Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Tue, 7 Aug 2012 18:12:30 +0200 Subject: [PATCH] --- yaml --- r: 323737 b: refs/heads/master c: 8bd874456e2ec49b9e64372ddc89a6f88901d184 h: refs/heads/master i: 323735: 6f38b73e692b7e22d442b81b00a933d143d96bba v: v3 --- [refs] | 2 +- trunk/kernel/events/uprobes.c | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index ca69922a30f4..7f02f2991a33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61e1d394984110e2e76f25572d5b1b5d48796751 +refs/heads/master: 8bd874456e2ec49b9e64372ddc89a6f88901d184 diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c index 7cff24c60dd7..0cefde276641 100644 --- a/trunk/kernel/events/uprobes.c +++ b/trunk/kernel/events/uprobes.c @@ -1516,17 +1516,15 @@ static void handle_swbp(struct pt_regs *regs) utask->active_uprobe = NULL; utask->state = UTASK_RUNNING; } - if (uprobe) { - if (!(uprobe->flags & UPROBE_SKIP_SSTEP)) + if (!(uprobe->flags & UPROBE_SKIP_SSTEP)) - /* - * cannot singlestep; cannot skip instruction; - * re-execute the instruction. - */ - instruction_pointer_set(regs, bp_vaddr); + /* + * cannot singlestep; cannot skip instruction; + * re-execute the instruction. + */ + instruction_pointer_set(regs, bp_vaddr); - put_uprobe(uprobe); - } + put_uprobe(uprobe); } /*