]> err.no Git - linux-2.6/commitdiff
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Jul 2008 21:48:31 +0000 (14:48 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Jul 2008 21:48:31 +0000 (14:48 -0700)
* 'bkl-removal' of git://git.lwn.net/linux-2.6: (146 commits)
  IB/umad: BKL is not needed for ib_umad_open()
  IB/uverbs: BKL is not needed for ib_uverbs_open()
  bf561-coreb: BKL unneeded for open()
  Call fasync() functions without the BKL
  snd/PCM: fasync BKL pushdown
  ipmi: fasync BKL pushdown
  ecryptfs: fasync BKL pushdown
  Bluetooth VHCI: fasync BKL pushdown
  tty_io: fasync BKL pushdown
  tun: fasync BKL pushdown
  i2o: fasync BKL pushdown
  mpt: fasync BKL pushdown
  Remove BKL from remote_llseek v2
  Make FAT users happier by not deadlocking
  x86-mce: BKL pushdown
  vmwatchdog: BKL pushdown
  vmcp: BKL pushdown
  via-pmu: BKL pushdown
  uml-random: BKL pushdown
  uml-mmapper: BKL pushdown
  ...

17 files changed:
1  2 
arch/s390/crypto/prng.c
arch/x86/kernel/apm_32.c
arch/x86/kernel/cpu/mcheck/mce_64.c
arch/x86/kernel/microcode.c
block/bsg.c
drivers/block/paride/pt.c
drivers/gpu/drm/drm_fops.c
drivers/pcmcia/pcmcia_ioctl.c
drivers/s390/char/fs3270.c
drivers/s390/char/monreader.c
drivers/s390/char/vmcp.c
drivers/s390/char/vmlogrdr.c
drivers/s390/char/vmur.c
drivers/s390/char/vmwatchdog.c
drivers/s390/crypto/zcrypt_api.c
drivers/scsi/sg.c
sound/core/sound.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc block/bsg.c
Simple merge
Simple merge
Simple merge
index afd00e7bbbefe92f53cbfd82cc52ea8f323357e8,138396ef5be9c38886a6c9a856dff081b681a636..419f97fc9a625befbd2805ec1b0693a4bb1af6b1
  #include <linux/proc_fs.h>
  #include <linux/poll.h>
  #include <linux/pci.h>
+ #include <linux/smp_lock.h>
  #include <linux/workqueue.h>
  
 -#define IN_CARD_SERVICES
  #include <pcmcia/cs_types.h>
  #include <pcmcia/cs.h>
  #include <pcmcia/cistpl.h>
Simple merge
index f0e4c96afbf803f12c17f296d0fd645a57cb93b4,dc4710e64e0c61134aa1766bf755aecfc7425541..35fd8dfcaaa6d22d2083304ccdd9ebb4137d3af7
@@@ -326,7 -377,9 +328,8 @@@ static int mon_open(struct inode *inode
                rc = -EIO;
                goto out_path;
        }
 -      P_INFO("open, established connection to *MONITOR service\n\n");
        filp->private_data = monpriv;
+       unlock_kernel();
        return nonseekable_open(inode, filp);
  
  out_path:
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge