module_param: make bool parameters really bool (drivers & misc)

[cascardo/linux.git] / drivers / char / random.c

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 6035ab8..732215b 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -387,7 +387,7 @@ static DECLARE_WAIT_QUEUE_HEAD(random_write_wait);
 static struct fasync_struct *fasync;
 
 #if 0
-static int debug;
+static bool debug;
 module_param(debug, bool, 0644);
 #define DEBUG_ENT(fmt, arg...) do { \
        if (debug) \
@@ -624,8 +624,8 @@ static struct timer_rand_state input_timer_state;
 static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
 {
        struct {
-               cycles_t cycles;
                long jiffies;
+               unsigned cycles;
                unsigned num;
        } sample;
        long delta, delta2, delta3;
@@ -637,7 +637,11 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
                goto out;
 
        sample.jiffies = jiffies;
-       sample.cycles = get_cycles();
+
+       /* Use arch random value, fall back to cycles */
+       if (!arch_get_random_int(&sample.cycles))
+               sample.cycles = get_cycles();
+
        sample.num = num;
        mix_pool_bytes(&input_pool, &sample, sizeof(sample));