diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 08:07:51 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-09 08:07:51 -0800 |
commit | 2588465badb648a50cd19623f0dd0063c90d4e31 (patch) | |
tree | d114566c6b0c1d5b0958493a7a2ae5f1f2c6838c /arch/um/drivers/random.c | |
parent | 18821b0408efc92ec2804128ba9382a3bcebf132 (diff) | |
parent | 8c0daee204f794d095ae301f408c5f9f40e4547d (diff) | |
download | op-kernel-dev-2588465badb648a50cd19623f0dd0063c90d4e31.zip op-kernel-dev-2588465badb648a50cd19623f0dd0063c90d4e31.tar.gz |
Merge branch 'bkl-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'bkl-arch-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
mn10300: Remove the BKL from sys_execve
m68knommu: Remove the BKL from sys_execve
m68k: Remove the BKL from sys_execve
h83000: Remove BKL from sys_execve
frv: Remove the BKL from sys_execve
blackfin: Remove the BKL from sys_execve
um: Remove BKL from mmapper
um: Remove BKL from random
s390: Remove BKL from prng
Diffstat (limited to 'arch/um/drivers/random.c')
-rw-r--r-- | arch/um/drivers/random.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/um/drivers/random.c b/arch/um/drivers/random.c index 6eabb70..4949044 100644 --- a/arch/um/drivers/random.c +++ b/arch/um/drivers/random.c @@ -7,7 +7,6 @@ * of the GNU General Public License, incorporated herein by reference. */ #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/module.h> #include <linux/fs.h> #include <linux/interrupt.h> @@ -34,8 +33,6 @@ static DECLARE_WAIT_QUEUE_HEAD(host_read_wait); static int rng_dev_open (struct inode *inode, struct file *filp) { - cycle_kernel_lock(); - /* enforce read-only access to this chrdev */ if ((filp->f_mode & FMODE_READ) == 0) return -EINVAL; |