Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / kernel / trace / trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index ed1032d..ba14a22 100644 (file)
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -741,13 +741,6 @@ __acquires(kernel_lock)
                return -1;
        }
 
-       /*
-        * When this gets called we hold the BKL which means that
-        * preemption is disabled. Various trace selftests however
-        * need to disable and enable preemption for successful tests.
-        * So we drop the BKL here and grab it after the tests again.
-        */
-       unlock_kernel();
        mutex_lock(&trace_types_lock);
 
        tracing_selftest_running = true;
@@ -829,7 +822,6 @@ __acquires(kernel_lock)
 #endif
 
  out_unlock:
-       lock_kernel();
        return ret;
 }