Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / drivers / char / random.c

diff --git a/drivers/char/random.c b/drivers/char/random.c
index 2726a41..074bf22 100644 (file)
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -224,6 +224,7 @@
  */
 
 #include <linux/utsname.h>
  */
 
 #include <linux/utsname.h>

+#include <linux/config.h>

 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/major.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/major.h>


@@ -416,7 +417,7 @@ static struct entropy_store input_pool = {
        .poolinfo = &poolinfo_table[0],
        .name = "input",
        .limit = 1,
        .poolinfo = &poolinfo_table[0],
        .name = "input",
        .limit = 1,

-       .lock = __SPIN_LOCK_UNLOCKED(&input_pool.lock),
+       .lock = SPIN_LOCK_UNLOCKED,

        .pool = input_pool_data
 };
 
        .pool = input_pool_data
 };
 


@@ -425,7 +426,7 @@ static struct entropy_store blocking_pool = {
        .name = "blocking",
        .limit = 1,
        .pull = &input_pool,
        .name = "blocking",
        .limit = 1,
        .pull = &input_pool,

-       .lock = __SPIN_LOCK_UNLOCKED(&blocking_pool.lock),
+       .lock = SPIN_LOCK_UNLOCKED,

        .pool = blocking_pool_data
 };
 
        .pool = blocking_pool_data
 };
 


@@ -433,7 +434,7 @@ static struct entropy_store nonblocking_pool = {
        .poolinfo = &poolinfo_table[1],
        .name = "nonblocking",
        .pull = &input_pool,
        .poolinfo = &poolinfo_table[1],
        .name = "nonblocking",
        .pull = &input_pool,

-       .lock = __SPIN_LOCK_UNLOCKED(&nonblocking_pool.lock),
+       .lock = SPIN_LOCK_UNLOCKED,

        .pool = nonblocking_pool_data
 };
 
        .pool = nonblocking_pool_data
 };