From f07f6aef5c2eccaadf71bddcc624f08c918210e7 Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Thu, 27 Nov 2008 10:21:46 +0800
Subject: [PATCH] --- yaml --- r: 119417 b: refs/heads/master c:
 4f5a7f40ddbae98569acbb99118a98570315579c h: refs/heads/master i:   119415:
 973c84add11337bad45ab3e4e5c566107aa1c130 v: v3

---
 [refs]                           | 2 +-
 trunk/kernel/trace/ring_buffer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 72f25d37df11..dcacef187ff0 100644
--- 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
index f780e9552f91..668bbb5ef2bd 100644
--- 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;