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); }