From 01ffd91829d2b7c81d01093ba7951b3d8590deae Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 20 May 2008 19:15:46 +0200
Subject: [PATCH] --- yaml --- r: 100339 b: refs/heads/master c:
 e73322ceefb2a777dc0ef369a2504bf5c42b8c52 h: refs/heads/master i:   100337:
 d7c8794263e6eeca4cdbe3c857327f98af2774d7   100335:
 66fd87d858d7b02bc5b80fbd201d21d45002d87a v: v3

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

diff --git a/[refs] b/[refs]
index ba40b8c178f6..3f5085984f8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 135fe10f9fb9fba981f60c5526e37900f52c9705
+refs/heads/master: e73322ceefb2a777dc0ef369a2504bf5c42b8c52
diff --git a/trunk/drivers/s390/crypto/zcrypt_api.c b/trunk/drivers/s390/crypto/zcrypt_api.c
index 4d36e805a234..e41c2fa86d8b 100644
--- a/trunk/drivers/s390/crypto/zcrypt_api.c
+++ b/trunk/drivers/s390/crypto/zcrypt_api.c
@@ -34,6 +34,7 @@
 #include <linux/fs.h>
 #include <linux/proc_fs.h>
 #include <linux/compat.h>
+#include <linux/smp_lock.h>
 #include <asm/atomic.h>
 #include <asm/uaccess.h>
 #include <linux/hw_random.h>
@@ -300,7 +301,9 @@ static ssize_t zcrypt_write(struct file *filp, const char __user *buf,
  */
 static int zcrypt_open(struct inode *inode, struct file *filp)
 {
+	lock_kernel();
 	atomic_inc(&zcrypt_open_count);
+	unlock_kernel();
 	return 0;
 }