---

yaml --- r: 350103 b: refs/heads/master c: 1b47aef h: refs/heads/master i: 350101: b9e5045 350099: bd95ac6 350095: c9ec5bf v: v3
git-mirror · Feb 8, 2013 · 611e134 · 611e134
1 parent 0b3f045
commit 611e134
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a932b7381f81235530c3d0acbd3ba2c7537d78e5
+refs/heads/master: 1b47aefd9b6bd439a4be43c47acd22987ac22db8
diff --git a/trunk/kernel/trace/trace_uprobe.c b/trunk/kernel/trace/trace_uprobe.c
@@ -476,8 +476,6 @@ static void uprobe_trace_func(struct trace_uprobe *tu, struct pt_regs *regs)
 	unsigned long irq_flags;
 	struct ftrace_event_call *call = &tu->call;
 
-	tu->nhit++;
-
 	local_save_flags(irq_flags);
 	pc = preempt_count();
 
@@ -701,6 +699,7 @@ static int uprobe_dispatcher(struct uprobe_consumer *con, struct pt_regs *regs)
 	struct trace_uprobe *tu;
 
 	tu = container_of(con, struct trace_uprobe, consumer);
+	tu->nhit++;
 
 	if (tu->flags & TP_FLAG_TRACE)
 		uprobe_trace_func(tu, regs);