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 #include #include +#include #include #include #include @@ -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); }