diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-28 14:00:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-28 14:00:33 -0700 |
| commit | eedf2c5296a8dfaaf9aec1a938c1d3bd73159a30 (patch) | |
| tree | a02e5ef1f2ae46c6328a6744e806c9e7dbff7327 /kernel/async.c | |
| parent | 0151f94f2e61c39858e714a5d92244b0e5a7fdf5 (diff) | |
| parent | df52092f3c97788592ef72501a43fb7ac6a3cfe0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-for-30
* git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-for-30:
fastboot: remove duplicate unpack_to_rootfs()
ide/net: flip the order of SATA and network init
async: remove the temporary (2.6.29) "async is off by default" code
Fix up conflicts in init/initramfs.c manually
Diffstat (limited to 'kernel/async.c')
| -rw-r--r-- | kernel/async.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/kernel/async.c b/kernel/async.c index f565891f2c9..968ef9457d4 100644 --- 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); |