---

yaml --- r: 119417 b: refs/heads/master c: 4f5a7f4 h: refs/heads/master i: 119415: 973c84a v: v3
git-mirror · Nov 27, 2008 · f07f6ae · f07f6ae
1 parent 5603e93
commit f07f6ae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb91ee6cf5b8be5360acec577458e29ec7e97e5e
+refs/heads/master: 4f5a7f40ddbae98569acbb99118a98570315579c
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
@@ -1215,7 +1215,7 @@ ring_buffer_lock_reserve(struct ring_buffer *buffer,
 
  out:
 	if (resched)
-		preempt_enable_notrace();
+		preempt_enable_no_resched_notrace();
 	else
 		preempt_enable_notrace();
 	return NULL;