async: make async a command line option for now

[linux-2.6-omap-h63xx.git] / kernel / async.c

diff --git a/kernel/async.c b/kernel/async.c
index 97373380c9e7be42ad7126c6a5d436f7954cc0aa..f286e9f2b736e29515607e463e2fa58747e6ff9b 100644 (file)
--- a/kernel/async.c
+++ b/kernel/async.c
@@ -65,6 +65,8 @@ static LIST_HEAD(async_pending);
 static LIST_HEAD(async_running);
 static DEFINE_SPINLOCK(async_lock);
 
+static int async_enabled = 0;
+
 struct async_entry {
        struct list_head list;
        async_cookie_t   cookie;
@@ -169,7 +171,7 @@ static async_cookie_t __async_schedule(async_func_ptr *ptr, void *data, struct l
         * If we're out of memory or if there's too much work
         * pending already, we execute synchronously.
         */
-       if (!entry || atomic_read(&entry_count) > MAX_WORK) {
+       if (!async_enabled || !entry || atomic_read(&entry_count) > MAX_WORK) {
                kfree(entry);
                spin_lock_irqsave(&async_lock, flags);
                newcookie = next_cookie++;
@@ -206,7 +208,9 @@ EXPORT_SYMBOL_GPL(async_schedule_special);
 
 void async_synchronize_full(void)
 {
-       async_synchronize_cookie(next_cookie);
+       do {
+               async_synchronize_cookie(next_cookie);
+       } while (!list_empty(&async_running) || !list_empty(&async_pending));
 }
 EXPORT_SYMBOL_GPL(async_synchronize_full);
 
@@ -314,8 +318,18 @@ static int async_manager_thread(void *unused)
 
 static int __init async_init(void)
 {
-       kthread_run(async_manager_thread, NULL, "async/mgr");
+       if (async_enabled)
+               kthread_run(async_manager_thread, NULL, "async/mgr");
        return 0;
 }
 
+static int __init setup_async(char *str)
+{
+       async_enabled = 1;
+       return 1;
+}
+
+__setup("fastboot", setup_async);
+
+
 core_initcall(async_init);