diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-02 08:47:35 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-02 08:47:35 -0700 |
commit | 96f3ee280549ebf62818ef71603061a3b3230eb9 (patch) | |
tree | 42576f17169c6c9a2d334cf70ae313a02580f26c /arch/s390/crypto/prng.c | |
parent | fa515888821d307a79cb8d1e8e052b7aff39d844 (diff) | |
parent | a9851832857dc1e4efefca1713f5cff3e168a25c (diff) |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] irqstats: fix counting of pfault, dasd diag and virtio irqs
[S390] prng: fix pointer arithmetic
Diffstat (limited to 'arch/s390/crypto/prng.c')
-rw-r--r-- | arch/s390/crypto/prng.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c index 44bca3f994b..8b16c479585 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); + *((__u64 *)parm_block) ^= *((__u64 *)(buf+i)); prng_add_entropy(); i += 8; nbytes -= 8; |