---

yaml --- r: 304967 b: refs/heads/master c: 895b67f h: refs/heads/master i: 304965: 228470a 304963: b250fda 304959: 5ad6f8b v: v3
git-mirror · May 19, 2012 · 86503a1 · 86503a1
1 parent 31b22eb
commit 86503a1
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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;