Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c
index aa819dac2360..0808fbf0f7d3 100644
--- a/arch/s390/crypto/prng.c
+++ b/arch/s390/crypto/prng.c
@@ -76,7 +76,7 @@ static void prng_seed(int nbytes)
 
         /* Add the entropy */
         while (nbytes >= 8) {
-                *((__u64 *)parm_block) ^= *((__u64 *)buf+i*8);
+                *((__u64 *)parm_block) ^= *((__u64 *)(buf+i));
                 prng_add_entropy();
                 i += 8;
                 nbytes -= 8;
@@ -152,6 +152,7 @@ static const struct file_operations prng_fops = {
         .open           = &prng_open,
         .release        = NULL,
         .read           = &prng_read,
+        .llseek         = noop_llseek,
 };
 
 static struct miscdevice prng_dev = {
@@ -165,7 +166,7 @@ static int __init prng_init(void)
         int ret;
 
         /* check if the CPU has a PRNG */
-        if (!crypt_s390_func_available(KMC_PRNG))
+        if (!crypt_s390_func_available(KMC_PRNG, CRYPT_S390_MSA))
                 return -EOPNOTSUPP;
 
         if (prng_chunk_size < 8)