From d299fafa29f2533fe5a18e95ffb89c84acb8cd6e Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Fri, 2 Jul 2010 10:03:51 +0200
Subject: [PATCH] --- yaml --- r: 206235 b: refs/heads/master c:
 a1e453d2799760ecf2e09ecd45b80edbe7ff540e h: refs/heads/master i:   206233:
 e4b6690252682c2ca00855f12f130c48b372a5de   206231:
 01bcab83350bc16c0d7305d943abbe1784437ce5 v: v3

---
 [refs]                   | 2 +-
 trunk/kernel/workqueue.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f28274c6947b..e09bbafd2c26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ce48b37bfedc2bc11e61eae76784887e88b922c
+refs/heads/master: a1e453d2799760ecf2e09ecd45b80edbe7ff540e
diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c
index b59c946433f4..0c485a538099 100644
--- a/trunk/kernel/workqueue.c
+++ b/trunk/kernel/workqueue.c
@@ -445,7 +445,7 @@ static struct global_cwq *get_work_gcwq(struct work_struct *work)
 	if (cpu == NR_CPUS)
 		return NULL;
 
-	BUG_ON(cpu >= num_possible_cpus());
+	BUG_ON(cpu >= nr_cpu_ids);
 	return get_gcwq(cpu);
 }