From 611e1345e51f3c9214d5f5332f3a610dcd77c994 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Thu, 31 Jan 2013 19:55:27 +0100 Subject: [PATCH] --- yaml --- r: 350103 b: refs/heads/master c: 1b47aefd9b6bd439a4be43c47acd22987ac22db8 h: refs/heads/master i: 350101: b9e5045a5a3883e04f2b5140aae489f317cdd96b 350099: bd95ac61268acbf76e63af7dbd045968faf1a2e4 350095: c9ec5bf127874b0e8c633488caebeb85593d4fac v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_uprobe.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 4c8322c47617..a163bdffe8a5 100644 --- 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 index 9c8babbfd11b..c4e29e19fdd7 100644 --- 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);