Merge tag 'v3.8-rc4' into irq/core

Merge Linux 3.8-rc4 before pulling in new commits - we were on an old v3.7 base.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 4 insertions, 3 deletions

diff --git a/lib/interval_tree_test_main.c b/lib/interval_tree_test_main.c
index b25903987f7a..245900b98c8e 100644
--- a/lib/interval_tree_test_main.c
+++ b/lib/interval_tree_test_main.c
@@ -30,7 +30,8 @@ static void init(void)
 {
         int i;
         for (i = 0; i < NODES; i++) {
-                u32 a = prandom32(&rnd), b = prandom32(&rnd);
+                u32 a = prandom_u32_state(&rnd);
+                u32 b = prandom_u32_state(&rnd);
                 if (a <= b) {
                         nodes[i].start = a;
                         nodes[i].last = b;
@@ -40,7 +41,7 @@ static void init(void)
                 }
         }
         for (i = 0; i < SEARCHES; i++)
-                queries[i] = prandom32(&rnd);
+                queries[i] = prandom_u32_state(&rnd);
 }
 
 static int interval_tree_test_init(void)
@@ -51,7 +52,7 @@ static int interval_tree_test_init(void)
 
         printk(KERN_ALERT "interval tree insert/remove");
 
-        prandom32_seed(&rnd, 3141592653589793238ULL);
+        prandom_seed_state(&rnd, 3141592653589793238ULL);
         init();
 
         time1 = get_cycles();