Merge branch 'for-2.6.30' into for-2.6.31

[sfrench/cifs-2.6.git] / kernel / async.c

diff --git a/kernel/async.c b/kernel/async.c
index f565891f2c9bd069873b93c12e7ecb0424876c90..968ef9457d4ec90aeb5148695c31ae02b68d33bb 100644 (file)
--- a/kernel/async.c
+++ b/kernel/async.c
@@ -49,6 +49,7 @@ asynchronous and synchronous parts of the kernel.
 */
 
 #include <linux/async.h>
+#include <linux/bug.h>
 #include <linux/module.h>
 #include <linux/wait.h>
 #include <linux/sched.h>
@@ -387,20 +388,11 @@ static int async_manager_thread(void *unused)
 
 static int __init async_init(void)
 {
-       if (async_enabled)
-               if (IS_ERR(kthread_run(async_manager_thread, NULL,
-                                      "async/mgr")))
-                       async_enabled = 0;
-       return 0;
-}
+       async_enabled =
+               !IS_ERR(kthread_run(async_manager_thread, NULL, "async/mgr"));
 
-static int __init setup_async(char *str)
-{
-       async_enabled = 1;
-       return 1;
+       WARN_ON(!async_enabled);
+       return 0;
 }
 
-__setup("fastboot", setup_async);
-
-
 core_initcall(async_init);