From c486c261712e0990b5bd8d81336384bd8876b913 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Sat, 11 Sep 2010 20:11:08 +0200
Subject: [PATCH] --- yaml --- r: 212926 b: refs/heads/master c:
 0fc86c7bd924debd0bddee790ecc884604fdcc63 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/kernel/rtmutex-tester.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d228aaa0be4f..d688f459661d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 72024f1ec5164a70d84dd8cf4458fe4064a6b692
+refs/heads/master: 0fc86c7bd924debd0bddee790ecc884604fdcc63
diff --git a/trunk/kernel/rtmutex-tester.c b/trunk/kernel/rtmutex-tester.c
index a56f629b057a..66cb89bc5ef1 100644
--- a/trunk/kernel/rtmutex-tester.c
+++ b/trunk/kernel/rtmutex-tester.c
@@ -76,7 +76,9 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
 		}
 
 		if (!lockwakeup && td->bkl == 4) {
+#ifdef CONFIG_LOCK_KERNEL
 			unlock_kernel();
+#endif
 			td->bkl = 0;
 		}
 		return 0;
@@ -133,14 +135,18 @@ static int handle_op(struct test_thread_data *td, int lockwakeup)
 		if (td->bkl)
 			return 0;
 		td->bkl = 1;
+#ifdef CONFIG_LOCK_KERNEL
 		lock_kernel();
+#endif
 		td->bkl = 4;
 		return 0;
 
 	case RTTEST_UNLOCKBKL:
 		if (td->bkl != 4)
 			break;
+#ifdef CONFIG_LOCK_KERNEL
 		unlock_kernel();
+#endif
 		td->bkl = 0;
 		return 0;