diff options
Diffstat (limited to 'drivers/char')
-rw-r--r-- | drivers/char/random.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index 6035ab8d5ef7..85da8740586b 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
@@ -624,8 +624,8 @@ static struct timer_rand_state input_timer_state; | |||
624 | static void add_timer_randomness(struct timer_rand_state *state, unsigned num) | 624 | static void add_timer_randomness(struct timer_rand_state *state, unsigned num) |
625 | { | 625 | { |
626 | struct { | 626 | struct { |
627 | cycles_t cycles; | ||
628 | long jiffies; | 627 | long jiffies; |
628 | unsigned cycles; | ||
629 | unsigned num; | 629 | unsigned num; |
630 | } sample; | 630 | } sample; |
631 | long delta, delta2, delta3; | 631 | long delta, delta2, delta3; |
@@ -637,7 +637,11 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num) | |||
637 | goto out; | 637 | goto out; |
638 | 638 | ||
639 | sample.jiffies = jiffies; | 639 | sample.jiffies = jiffies; |
640 | sample.cycles = get_cycles(); | 640 | |
641 | /* Use arch random value, fall back to cycles */ | ||
642 | if (!arch_get_random_int(&sample.cycles)) | ||
643 | sample.cycles = get_cycles(); | ||
644 | |||
641 | sample.num = num; | 645 | sample.num = num; |
642 | mix_pool_bytes(&input_pool, &sample, sizeof(sample)); | 646 | mix_pool_bytes(&input_pool, &sample, sizeof(sample)); |
643 | 647 | ||