From 8553f16c5dfc25c9b3b960f8389e70bd705d747d Mon Sep 17 00:00:00 2001
From: Hannes Eder <hannes@hanneseder.net>
Date: Tue, 10 Feb 2009 19:44:45 +0100
Subject: [PATCH] --- yaml --- r: 140728 b: refs/heads/master c:
 e7669b8e329255bbcb40af65b38e342825d97a46 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/kernel/trace/trace.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9f85af762601..30e54980b359 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e39841c45cf5e6ea930ede1b0303309e03037a2
+refs/heads/master: e7669b8e329255bbcb40af65b38e342825d97a46
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index e2434990277c..95f99a7abf2f 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -459,6 +459,8 @@ update_max_tr_single(struct trace_array *tr, struct task_struct *tsk, int cpu)
  * Register a new plugin tracer.
  */
 int register_tracer(struct tracer *type)
+__releases(kernel_lock)
+__acquires(kernel_lock)
 {
 	struct tracer *t;
 	int len;