diff options
| author | Tejun Heo <tj@kernel.org> | 2011-03-28 18:08:07 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2011-03-28 18:08:07 +0200 |
| commit | ac24307b6910e7286910c1f227bd7951b87a3bae (patch) | |
| tree | d36e3ef5233157e011f255108d317189542c51a6 /kernel | |
| parent | 5f55924deaa62d6df687c131fb92aebe071ec787 (diff) | |
| parent | 0415b00d175e0d8945e6785aad21b5f157976ce0 (diff) | |
Merge branch 'for-2.6.40' into for-next
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/workqueue.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 04ef830690ec..d30a502e8c6d 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -2860,9 +2860,7 @@ static int alloc_cwqs(struct workqueue_struct *wq) } } - /* just in case, make sure it's actually aligned - * - this is affected by PERCPU() alignment in vmlinux.lds.S - */ + /* just in case, make sure it's actually aligned */ BUG_ON(!IS_ALIGNED(wq->cpu_wq.v, align)); return wq->cpu_wq.v ? 0 : -ENOMEM; } |