From: Matt Mackall Simplify the init code Signed-off-by: Matt Mackall Signed-off-by: Andrew Morton --- 25-akpm/drivers/char/random.c | 20 +++----------------- 1 files changed, 3 insertions(+), 17 deletions(-) diff -puN drivers/char/random.c~random-pt2-simplify-initialization drivers/char/random.c --- 25/drivers/char/random.c~random-pt2-simplify-initialization 2005-01-16 00:53:31.467225144 -0800 +++ 25-akpm/drivers/char/random.c 2005-01-16 00:53:31.473224232 -0800 @@ -1485,9 +1485,6 @@ EXPORT_SYMBOL(get_random_bytes); static void init_std_data(struct entropy_store *r) { struct timeval tv; - __u32 words[2]; - char *p; - int i; unsigned long flags; spin_lock_irqsave(&r->lock, flags); @@ -1495,20 +1492,9 @@ static void init_std_data(struct entropy spin_unlock_irqrestore(&r->lock, flags); do_gettimeofday(&tv); - words[0] = tv.tv_sec; - words[1] = tv.tv_usec; - add_entropy_words(r, words, 2); - - /* - * This doesn't lock system.utsname. However, we are generating - * entropy so a race with a name set here is fine. - */ - p = (char *) &system_utsname; - for (i = sizeof(system_utsname) / sizeof(words); i; i--) { - memcpy(words, p, sizeof(words)); - add_entropy_words(r, words, sizeof(words)/4); - p += sizeof(words); - } + add_entropy_words(r, (__u32 *)&tv, sizeof(tv)/4); + add_entropy_words(r, (__u32 *)&system_utsname, + sizeof(system_utsname)/4); } static int __init rand_initialize(void) _