rtmutex-tester: make it build without BKL
authorArnd Bergmann <arnd@arndb.de>
Sat, 11 Sep 2010 18:11:08 +0000 (20:11 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 19 Oct 2010 09:29:56 +0000 (11:29 +0200)
The big kernel lock is going away, so make sure
that if it is disabled by Kconfig, we do not
try to validate it, which would result in
compile errors.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Arjan van de Ven <arjan@linux.intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
kernel/rtmutex-tester.c

index a56f629..66cb89b 100644 (file)
@@ -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;