summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-10-10 10:21:03 +0200
committerThomas Gleixner <tglx@linutronix.de>2009-10-14 15:35:50 +0200
commitca1b82ba0888e742a7efdb89ed8e2aab453e091f (patch)
treee1843a0970f438e96183872550611943f074357d
parentMerge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block (diff)
downloadlinux-ca1b82ba0888e742a7efdb89ed8e2aab453e091f.tar.xz
linux-ca1b82ba0888e742a7efdb89ed8e2aab453e091f.zip
s390: Remove BKL from prng
cycle_kernel_lock() was added during the big BKL pushdown. It should ensure the serializiation against driver init code. In this case there is nothing to serialize. Remove it. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> LKML-Reference: <20091010153349.601625576@linutronix.de> Acked-by: Jan Glauber <jang@linux.vnet.ibm.com>
-rw-r--r--arch/s390/crypto/prng.c2
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);
}