diff options
Diffstat (limited to 'drivers/char/random.c')
-rw-r--r-- | drivers/char/random.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index f4013b8a711b..561082d46a82 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
@@ -1131,8 +1131,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num) | |||
1131 | } sample; | 1131 | } sample; |
1132 | long delta, delta2, delta3; | 1132 | long delta, delta2, delta3; |
1133 | 1133 | ||
1134 | preempt_disable(); | ||
1135 | |||
1136 | sample.jiffies = jiffies; | 1134 | sample.jiffies = jiffies; |
1137 | sample.cycles = random_get_entropy(); | 1135 | sample.cycles = random_get_entropy(); |
1138 | sample.num = num; | 1136 | sample.num = num; |
@@ -1170,8 +1168,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num) | |||
1170 | * and limit entropy entimate to 12 bits. | 1168 | * and limit entropy entimate to 12 bits. |
1171 | */ | 1169 | */ |
1172 | credit_entropy_bits(r, min_t(int, fls(delta>>1), 11)); | 1170 | credit_entropy_bits(r, min_t(int, fls(delta>>1), 11)); |
1173 | |||
1174 | preempt_enable(); | ||
1175 | } | 1171 | } |
1176 | 1172 | ||
1177 | void add_input_randomness(unsigned int type, unsigned int code, | 1173 | void add_input_randomness(unsigned int type, unsigned int code, |