Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

* 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl:
  BKL: introduce CONFIG_BKL.
  dabusb: remove the BKL
  sunrpc: remove the big kernel lock
  init/main.c: remove BKL notations
  blktrace: remove the big kernel lock
  rtmutex-tester: make it build without BKL
  dvb-core: kill the big kernel lock
  dvb/bt8xx: kill the big kernel lock
  tlclk: remove big kernel lock
  fix rawctl compat ioctls breakage on amd64 and itanic
  uml: kill big kernel lock
  parisc: remove big kernel lock
  cris: autoconvert trivial BKL users
  alpha: kill big kernel lock
  isapnp: BKL removal
  s390/block: kill the big kernel lock
  hpet: kill BKL, add compat_ioctl

2 files changed, 1 insertions, 3 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 36890f0c8456..be85a0ab1b82 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -71,7 +71,7 @@ config BROKEN_ON_SMP
 
 config LOCK_KERNEL
         bool
-        depends on SMP || PREEMPT
+        depends on (SMP || PREEMPT) && BKL
         default y
 
 config INIT_ENV_ARG_LIMIT
diff --git a/init/main.c b/init/main.c
index 9684c9670b48..e59af24a0b7c 100644
--- a/init/main.c
+++ b/init/main.c
@@ -424,7 +424,6 @@ static void __init setup_command_line(char *command_line)
 static __initdata DECLARE_COMPLETION(kthreadd_done);
 
 static noinline void __init_refok rest_init(void)
-        __releases(kernel_lock)
 {
         int pid;
 
@@ -818,7 +817,6 @@ static void run_init_process(const char *init_filename)
  * makes it inline to init() and it becomes part of init.text section
  */
 static noinline int init_post(void)
-        __releases(kernel_lock)
 {
         /* need to finish all async __init code before freeing the memory */
         async_synchronize_full();