From 0aec37fce4ba641d9d93db35184a70b772f85d85 Mon Sep 17 00:00:00 2001
From: Ben Collins <bcollins@debian.org>
Date: Sun, 8 Jan 2006 01:03:04 -0800
Subject: [PATCH] --- yaml --- r: 16962 b: refs/heads/master c:
 676121fcb66c861804e38d94214fd5670a1ef595 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/kernel/workqueue.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2b7ff6f2d412..c2c3482d6c99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fa37fd1627ec804e57ae0388555719b03b39f20
+refs/heads/master: 676121fcb66c861804e38d94214fd5670a1ef595
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
index 62d47220696a..e72fb6478da6 100644
--- a/trunk/kernel/workqueue.c
+++ b/trunk/kernel/workqueue.c
@@ -315,6 +315,11 @@ struct workqueue_struct *__create_workqueue(const char *name,
 		return NULL;
 
 	wq->cpu_wq = alloc_percpu(struct cpu_workqueue_struct);
+	if (!wq->cpu_wq) {
+		kfree(wq);
+		return NULL;
+	}
+
 	wq->name = name;
 	/* We don't need the distraction of CPUs appearing and vanishing. */
 	lock_cpu_hotplug();