[PATCH 3/4] workqueue: fix incorrect cpu number BUG_ON() in get_work_gcwq()

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Tejun Heo
Date: Friday, July 2, 2010 - 1:35 am

get_work_gcwq() was incorrectly triggering BUG_ON() if cpu number is
equal to or higher than num_possible_cpus() instead of nr_cpu_ids.
Fix it.

Signed-off-by: Tejun Heo <tj@kernel.org>
---
 kernel/workqueue.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index b59c946..0c485a5 100644
--- a/kernel/workqueue.c
+++ b/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);
 }

-- 
1.6.4.2

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 01/35] kthread: implement kthread_worker, Tejun Heo, (Mon Jun 28, 2:03 pm)
[PATCH 05/35] workqueue: kill RT workqueue, Tejun Heo, (Mon Jun 28, 2:03 pm)
[PATCH 06/35] workqueue: misc/cosmetic updates, Tejun Heo, (Mon Jun 28, 2:03 pm)
[PATCH 11/35] workqueue: kill cpu_populated_map, Tejun Heo, (Mon Jun 28, 2:03 pm)
[PATCH 12/35] workqueue: update cwq alignement, Tejun Heo, (Mon Jun 28, 2:04 pm)
Re: [PATCH 12/35] workqueue: update cwq alignement, Frederic Weisbecker, (Mon Jun 28, 3:47 pm)
Re: [PATCHSET] workqueue: concurrency managed workqueue, t ..., Frederic Weisbecker, (Mon Jun 28, 4:18 pm)
Re: [PATCH 12/35] workqueue: update cwq alignement, Tejun Heo, (Tue Jun 29, 12:39 am)
Re: [PATCH 12/35] workqueue: update cwq alignement, Frederic Weisbecker, (Tue Jun 29, 5:36 am)
Re: [PATCH UPDATED 12/35] workqueue: update cwq alignement, Frederic Weisbecker, (Tue Jun 29, 6:39 am)
Re: [PATCH 12/35] workqueue: update cwq alignement, Tejun Heo, (Tue Jun 29, 8:42 am)
Re: [PATCH 12/35] workqueue: update cwq alignement, Frederic Weisbecker, (Tue Jun 29, 8:47 am)
Re: [PATCH 12/35] workqueue: update cwq alignement, Tejun Heo, (Tue Jun 29, 8:51 am)
Re: [PATCH 12/35] workqueue: update cwq alignement, Frederic Weisbecker, (Tue Jun 29, 9:01 am)
Re: [PATCH 12/35] workqueue: update cwq alignement, Tejun Heo, (Tue Jun 29, 9:09 am)
Re: [PATCH 12/35] workqueue: update cwq alignement, Frederic Weisbecker, (Tue Jun 29, 9:17 am)
[PATCHSET] workqueue: fixes on top of cmwq take#6, Tejun Heo, (Fri Jul 2, 1:32 am)
[PATCH 3/4] workqueue: fix incorrect cpu number BUG_ON() i ..., Tejun Heo, (Fri Jul 2, 1:35 am)
Re: [PATCH 12/35] workqueue: update cwq alignement, Christoph Lameter, (Tue Jul 6, 7:22 am)