diff --git a/[refs] b/[refs] index 1d8ca76fb6fa..ce59b24f2d30 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ee2cb7f32b299c2b06a31fde155457203e4b7dd +refs/heads/master: 26a9a418237c0b06528941bca693c49c8d97edbe diff --git a/trunk/drivers/char/random.c b/trunk/drivers/char/random.c index b2ced39d76b2..8c7444857a4b 100644 --- a/trunk/drivers/char/random.c +++ b/trunk/drivers/char/random.c @@ -1673,7 +1673,7 @@ unsigned int get_random_int(void) int ret; keyptr = get_keyptr(); - hash[0] += current->pid + jiffies + get_cycles() + (int)(long)&ret; + hash[0] += current->pid + jiffies + get_cycles(); ret = half_md4_transform(hash, keyptr->secret); put_cpu_var(get_random_int_hash);