diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2009-03-15 19:11:44 +0100 |
|---|---|---|
| committer | Arjan van de Ven <arjan@linux.intel.com> | 2009-03-28 21:05:30 +0100 |
| commit | 9710794383ee5008d67f1a6613a4717bf6de47bc (patch) | |
| tree | 9917f2f1a345a6de6b957c308acc6b6b8813c697 /kernel/async.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-9710794383ee5008d67f1a6613a4717bf6de47bc.tar.xz linux-9710794383ee5008d67f1a6613a4717bf6de47bc.zip | |
async: remove the temporary (2.6.29) "async is off by default" code
Now that everyone has been able to test the async code (and it's being used
in the Moblin betas by default), we can enable it by default.
The various fixes needed have gone into 2.6.29 already.
[With an important bugfix from Stefan Richter]
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
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 f565891f2c9b..968ef9457d4e 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); |