2 files changed, 7 insertions, 4 deletions

diff --git a/arch/s390/crypto/crypt_s390.h b/arch/s390/crypto/crypt_s390.h
index 9992f95ef992..0ef9829f2ad6 100644
--- a/arch/s390/crypto/crypt_s390.h
+++ b/arch/s390/crypto/crypt_s390.h
@@ -296,6 +296,10 @@ static inline int crypt_s390_func_available(int func)
         unsigned char status[16];
         int ret;
 
+        /* check if CPACF facility (bit 17) is available */
+        if (!(stfl() & 1ULL << (31 - 17)))
+                return 0;
+
         switch (func & CRYPT_S390_OP_MASK) {
         case CRYPT_S390_KM:
                 ret = crypt_s390_km(KM_QUERY, &status, NULL, NULL, 0);
diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c
index 0cfefddd8375..eca724d229ec 100644
--- a/arch/s390/crypto/prng.c
+++ b/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);
 }
 
@@ -185,11 +187,8 @@ static int __init prng_init(void)
         prng_seed(16);
 
         ret = misc_register(&prng_dev);
-        if (ret) {
-                printk(KERN_WARNING
-                       "Could not register misc device for PRNG.\n");
+        if (ret)
                 goto out_buf;
-        }
         return 0;
 
 out_buf: