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/s390 | |
| parent | 18821b0408efc92ec2804128ba9382a3bcebf132 (diff) | |
| parent | 8c0daee204f794d095ae301f408c5f9f40e4547d (diff) | |
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/s390')
| -rw-r--r-- | arch/s390/crypto/prng.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c index b49c00ce65e9..a3209906739e 100644 --- a/arch/s390/crypto/prng.c +++ b/arch/s390/crypto/prng.c @@ -6,7 +6,6 @@ #include <linux/fs.h> #include <linux/init.h> #include <linux/kernel.h> -#include <linux/smp_lock.h> #include <linux/miscdevice.h> #include <linux/module.h> #include <linux/moduleparam.h> @@ -49,7 +48,6 @@ static unsigned char parm_block[32] = { static int prng_open(struct inode *inode, struct file *file) { - cycle_kernel_lock(); return nonseekable_open(inode, file); } |