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
This commit is contained in:
@ -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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user