diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 17:06:54 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 17:06:54 -0700 |
commit | 78417334b5cb6e1f915b8fdcc4fce3f1a1b4420c (patch) | |
tree | 8e3fce9f27fd058904c0a3247a5c5ebb8df9fbe8 /kernel/trace | |
parent | cd816a0d84377c4e87f55cbe934a23417f9f5743 (diff) | |
parent | 5f202bd5ca64132cdd7f186656bc0221f257733d (diff) | |
download | kernel_samsung_smdk4412-78417334b5cb6e1f915b8fdcc4fce3f1a1b4420c.zip kernel_samsung_smdk4412-78417334b5cb6e1f915b8fdcc4fce3f1a1b4420c.tar.gz kernel_samsung_smdk4412-78417334b5cb6e1f915b8fdcc4fce3f1a1b4420c.tar.bz2 |
Merge branch 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing
* 'bkl/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
do_coredump: Do not take BKL
init: Remove the BKL from startup code
Diffstat (limited to 'kernel/trace')
-rw-r--r-- | kernel/trace/trace.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index ed1032d..ba14a22 100644 --- 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; } |