diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 17:48:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-14 17:48:31 -0400 |
| commit | d1794f2c5b5817eb79ccc5e00701ca748d1b073a (patch) | |
| tree | 5a4c98e694e88a8c82f342d0cc9edb2a4cbbef36 /drivers/sbus/char/envctrl.c | |
| parent | a41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff) | |
| parent | 2fceef397f9880b212a74c418290ce69e7ac00eb (diff) | |
Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6
* '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
...
Diffstat (limited to 'drivers/sbus/char/envctrl.c')
| -rw-r--r-- | drivers/sbus/char/envctrl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c index dadabef116b6..a408402426f8 100644 --- a/drivers/sbus/char/envctrl.c +++ b/drivers/sbus/char/envctrl.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/miscdevice.h> | 27 | #include <linux/miscdevice.h> |
| 28 | #include <linux/kmod.h> | 28 | #include <linux/kmod.h> |
| 29 | #include <linux/reboot.h> | 29 | #include <linux/reboot.h> |
| 30 | #include <linux/smp_lock.h> | ||
| 30 | 31 | ||
| 31 | #include <asm/ebus.h> | 32 | #include <asm/ebus.h> |
| 32 | #include <asm/uaccess.h> | 33 | #include <asm/uaccess.h> |
| @@ -694,6 +695,7 @@ envctrl_ioctl(struct file *file, unsigned int cmd, unsigned long arg) | |||
| 694 | static int | 695 | static int |
| 695 | envctrl_open(struct inode *inode, struct file *file) | 696 | envctrl_open(struct inode *inode, struct file *file) |
| 696 | { | 697 | { |
| 698 | cycle_kernel_lock(); | ||
| 697 | file->private_data = NULL; | 699 | file->private_data = NULL; |
| 698 | return 0; | 700 | return 0; |
| 699 | } | 701 | } |