From 86503a1029578cf5075f98f7a0e49590fe6b2f75 Mon Sep 17 00:00:00 2001
From: Richard Weinberger <richard@nod.at>
Date: Mon, 7 Nov 2011 09:23:22 +0100
Subject: [PATCH] --- yaml --- r: 304967 b: refs/heads/master c:
 895b67fd5830ce18a6f1375a7c062fcf84b4b874 h: refs/heads/master i:   304965:
 228470af938520258b847df3c2b7fd162f46e50d   304963:
 b250fda2ce739d46be3d007ce998a64a0d043b22   304959:
 5ad6f8bd4717a330cf892156f19ea1c2d8262bae v: v3

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

diff --git a/[refs] b/[refs]
index 60de47e828c2..6637094584b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a591c73f127505cdbd0aa399a92112a8ddff8730
+refs/heads/master: 895b67fd5830ce18a6f1375a7c062fcf84b4b874
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
index a44d4c6ca9a8..b9a507c19c4b 100644
--- a/trunk/kernel/trace/trace.c
+++ b/trunk/kernel/trace/trace.c
@@ -763,8 +763,6 @@ 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 ret = 0;