---

yaml --- r: 323737 b: refs/heads/master c: 8bd8744 h: refs/heads/master i: 323735: 6f38b73 v: v3
git-mirror · Aug 28, 2012 · 8d4362a · 8d4362a
1 parent 702e373
commit 8d4362a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git 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
@@ -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);
 }
 
 /*