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

diff --cc arch/um/drivers/hostaudio_kern.c
index 63c740a85b4cca0ed9333091593885cbdfface2e,d92ff6d602972a3865e456c7ac6f6d67a3179901..f9f6a4e205901ee603d56d0167fb3c6e0807e868
--- 1/arch/um/drivers/hostaudio_kern.c
--- 2/arch/um/drivers/hostaudio_kern.c
+++ b/arch/um/drivers/hostaudio_kern.c
@@@ -61,8 -56,19 +61,10 @@@ static int set_mixer(char *name, int *a
  }
  
  __uml_setup("mixer=", set_mixer, "mixer=<mixer device>\n" MIXER_HELP);
 -
 -#else /*MODULE*/
 -
 -module_param(dsp, charp, 0644);
 -MODULE_PARM_DESC(dsp, DSP_HELP);
 -
 -module_param(mixer, charp, 0644);
 -MODULE_PARM_DESC(mixer, MIXER_HELP);
 -
  #endif
  
+ static DEFINE_MUTEX(hostaudio_mutex);
+ 
  /* /dev/dsp file operations */
  
  static ssize_t hostaudio_read(struct file *file, char __user *buffer,

diff --cc arch/um/drivers/ubd_kern.c
Simple merge

diff --cc arch/um/kernel/exec.c
Simple merge

diff --cc fs/nfs/Kconfig
Simple merge

diff --cc fs/nfsd/Kconfig
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc init/main.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

diff --cc net/sunrpc/rpc_pipe.c
Simple merge