git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
[pandora-kernel.git]
/
kernel
/
rtmutex-tester.c
diff --git
a/kernel/rtmutex-tester.c
b/kernel/rtmutex-tester.c
index
a56f629
..
66cb89b
100644
(file)
--- a/
kernel/rtmutex-tester.c
+++ b/
kernel/rtmutex-tester.c
@@
-76,7
+76,9
@@
static int handle_op(struct test_thread_data *td, int lockwakeup)
}
if (!lockwakeup && td->bkl == 4) {
}
if (!lockwakeup && td->bkl == 4) {
+#ifdef CONFIG_LOCK_KERNEL
unlock_kernel();
unlock_kernel();
+#endif
td->bkl = 0;
}
return 0;
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;
if (td->bkl)
return 0;
td->bkl = 1;
+#ifdef CONFIG_LOCK_KERNEL
lock_kernel();
lock_kernel();
+#endif
td->bkl = 4;
return 0;
case RTTEST_UNLOCKBKL:
if (td->bkl != 4)
break;
td->bkl = 4;
return 0;
case RTTEST_UNLOCKBKL:
if (td->bkl != 4)
break;
+#ifdef CONFIG_LOCK_KERNEL
unlock_kernel();
unlock_kernel();
+#endif
td->bkl = 0;
return 0;
td->bkl = 0;
return 0;