diff --git a/[refs] b/[refs] index dae9315e663e..b90c49371585 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 23657bb192f14b789e4c478def8f11ecc95b4f6c +refs/heads/master: 330dad5b9c9555632578c00e94e85c122561c5c7 diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c index 4fef9527a620..49d8f4a0110d 100644 --- a/trunk/kernel/workqueue.c +++ b/trunk/kernel/workqueue.c @@ -183,7 +183,8 @@ struct global_cwq { struct hlist_head busy_hash[BUSY_WORKER_HASH_SIZE]; /* L: hash of busy workers */ - struct worker_pool pools[2]; /* normal and highpri pools */ + struct worker_pool pools[NR_WORKER_POOLS]; + /* normal and highpri pools */ wait_queue_head_t rebind_hold; /* rebind hold wait */ } ____cacheline_aligned_in_smp;