|
@@ -724,6 +724,8 @@ struct timer_rand_state {
|
|
|
unsigned dont_count_entropy:1;
|
|
|
};
|
|
|
|
|
|
+#define INIT_TIMER_RAND_STATE { INITIAL_JIFFIES, };
|
|
|
+
|
|
|
/*
|
|
|
* Add device- or boot-specific data to the input and nonblocking
|
|
|
* pools to help initialize them to unique values.
|
|
@@ -750,7 +752,7 @@ void add_device_randomness(const void *buf, unsigned int size)
|
|
|
}
|
|
|
EXPORT_SYMBOL(add_device_randomness);
|
|
|
|
|
|
-static struct timer_rand_state input_timer_state;
|
|
|
+static struct timer_rand_state input_timer_state = INIT_TIMER_RAND_STATE;
|
|
|
|
|
|
/*
|
|
|
* This function adds entropy to the entropy "pool" by using timing
|
|
@@ -1267,8 +1269,10 @@ void rand_initialize_disk(struct gendisk *disk)
|
|
|
* source.
|
|
|
*/
|
|
|
state = kzalloc(sizeof(struct timer_rand_state), GFP_KERNEL);
|
|
|
- if (state)
|
|
|
+ if (state) {
|
|
|
+ state->last_time = INITIAL_JIFFIES;
|
|
|
disk->random = state;
|
|
|
+ }
|
|
|
}
|
|
|
#endif
|
|
|
|