aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2010-07-03 18:02:26 -0400
committerFrederic Weisbecker <fweisbec@gmail.com>2010-07-09 09:40:32 -0400
commit5e3d20a68f63fc5a310687d81956c3b96e488b84 (patch)
tree576da563442772fe7a492589c1e08c422ff02b1c /kernel/trace
parent815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff)
init: Remove the BKL from startup code
I have shown by code review that no driver takes the BKL at init time any more, so whatever the init code was locking against is no longer there and it is now safe to remove the BKL there. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Steven Rostedt <rostedt@goodmis> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/trace.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 086d36316805..8047ca5a8237 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -734,13 +734,6 @@ __acquires(kernel_lock)
734 return -1; 734 return -1;
735 } 735 }
736 736
737 /*
738 * When this gets called we hold the BKL which means that
739 * preemption is disabled. Various trace selftests however
740 * need to disable and enable preemption for successful tests.
741 * So we drop the BKL here and grab it after the tests again.
742 */
743 unlock_kernel();
744 mutex_lock(&trace_types_lock); 737 mutex_lock(&trace_types_lock);
745 738
746 tracing_selftest_running = true; 739 tracing_selftest_running = true;
@@ -822,7 +815,6 @@ __acquires(kernel_lock)
822#endif 815#endif
823 816
824 out_unlock: 817 out_unlock:
825 lock_kernel();
826 return ret; 818 return ret;
827} 819}
828 820