From 84652782aba81a76a6b94d89ba0dbc72ddaf0d06 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 19:15:45 +0200
Subject: [PATCH] --- yaml --- r: 100338 b: refs/heads/master c:
 135fe10f9fb9fba981f60c5526e37900f52c9705 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/s390/crypto/prng.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e6e76f357daa..ba40b8c178f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b05c9e6cd939b6f79be17e9b6a23ca15a219dec2
+refs/heads/master: 135fe10f9fb9fba981f60c5526e37900f52c9705
diff --git a/trunk/arch/s390/crypto/prng.c b/trunk/arch/s390/crypto/prng.c
index 0cfefddd8375..c238ee4aa038 100644
--- a/trunk/arch/s390/crypto/prng.c
+++ b/trunk/arch/s390/crypto/prng.c
@@ -6,6 +6,7 @@
 #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>
@@ -48,6 +49,7 @@ static unsigned char parm_block[32] = {
 
 static int prng_open(struct inode *inode, struct file *file)
 {
+	cycle_kernel_lock();
 	return nonseekable_open(inode, file);
 }