diff --git a/[refs] b/[refs] index 0ebc3811d66d..c827789d2820 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2860aaba4dc87fa43c08724434b87a8650f3bff5 +refs/heads/master: 75cfef32f26d03f5d0a0833572d52f94ad858a36 diff --git a/trunk/kernel/rcutorture.c b/trunk/kernel/rcutorture.c index 42e7f01e8003..43d6d4f9ef09 100644 --- a/trunk/kernel/rcutorture.c +++ b/trunk/kernel/rcutorture.c @@ -147,7 +147,7 @@ rcu_torture_free(struct rcu_torture *p) struct rcu_random_state { unsigned long rrs_state; - unsigned long rrs_count; + long rrs_count; }; #define RCU_RANDOM_MULT 39916801 /* prime */ @@ -160,7 +160,7 @@ struct rcu_random_state { * Crude but fast random-number generator. Uses a linear congruential * generator, with occasional help from get_random_bytes(). */ -static long +static unsigned long rcu_random(struct rcu_random_state *rrsp) { long refresh;