From e63ed179e2b81fd2f613e5b8c71192b20c329525 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 24 May 2009 19:38:25 -0700
Subject: [PATCH] --- yaml --- r: 145238 b: refs/heads/master c:
 93c32483808c5d82c9bd1eef2208854a6d1326db h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/init/main.c    |  3 +--
 trunk/kernel/async.c | 20 ++++++++++++--------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 7309622a24de..f91e58a14e3a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32bdfac5462d777f35b00838893c4f87baf23efe
+refs/heads/master: 93c32483808c5d82c9bd1eef2208854a6d1326db
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 3bbf93be744c..d721dad05dd7 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -566,8 +566,7 @@ asmlinkage void __init start_kernel(void)
 	tick_init();
 	boot_cpu_init();
 	page_address_init();
-	printk(KERN_NOTICE);
-	printk(linux_banner);
+	printk(KERN_NOTICE "%s", linux_banner);
 	setup_arch(&command_line);
 	mm_init_owner(&init_mm, &init_task);
 	setup_command_line(command_line);
diff --git a/trunk/kernel/async.c b/trunk/kernel/async.c
index 968ef9457d4e..50540301ed0f 100644
--- a/trunk/kernel/async.c
+++ b/trunk/kernel/async.c
@@ -92,19 +92,23 @@ extern int initcall_debug;
 static async_cookie_t  __lowest_in_progress(struct list_head *running)
 {
 	struct async_entry *entry;
+	async_cookie_t ret = next_cookie; /* begin with "infinity" value */
+
 	if (!list_empty(running)) {
 		entry = list_first_entry(running,
 			struct async_entry, list);
-		return entry->cookie;
-	} else if (!list_empty(&async_pending)) {
-		entry = list_first_entry(&async_pending,
-			struct async_entry, list);
-		return entry->cookie;
-	} else {
-		/* nothing in progress... next_cookie is "infinity" */
-		return next_cookie;
+		ret = entry->cookie;
 	}
 
+	if (!list_empty(&async_pending)) {
+		list_for_each_entry(entry, &async_pending, list)
+			if (entry->running == running) {
+				ret = entry->cookie;
+				break;
+			}
+	}
+
+	return ret;
 }
 
 static async_cookie_t  lowest_in_progress(struct list_head *running)