From a7b6f34a3d743b303cfa015fd42ec988ceb9d6ef Mon Sep 17 00:00:00 2001 From: Wenji Huang Date: Tue, 10 Feb 2009 01:02:46 -0500 Subject: [PATCH] --- yaml --- r: 140722 b: refs/heads/master c: f54fc98aa656f334c1571df6e3ca9178ea223847 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace_branch.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 8f2ab09f0d60..a11599c1202e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4543ae7ce1cb8b5ff27a59009e7991ea63791a71 +refs/heads/master: f54fc98aa656f334c1571df6e3ca9178ea223847 diff --git a/trunk/kernel/trace/trace_branch.c b/trunk/kernel/trace/trace_branch.c index f8ae2c50e01d..c2e68d440c4d 100644 --- a/trunk/kernel/trace/trace_branch.c +++ b/trunk/kernel/trace/trace_branch.c @@ -91,8 +91,6 @@ void trace_likely_condition(struct ftrace_branch_data *f, int val, int expect) int enable_branch_tracing(struct trace_array *tr) { - int ret = 0; - mutex_lock(&branch_tracing_mutex); branch_tracer = tr; /* @@ -103,7 +101,7 @@ int enable_branch_tracing(struct trace_array *tr) branch_tracing_enabled++; mutex_unlock(&branch_tracing_mutex); - return ret; + return 0; } void disable_branch_tracing(void)