diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 11:53:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 11:53:42 -0700 |
| commit | 5129df03d0c44b2d5a5f9d7d52f3b079706b9a8f (patch) | |
| tree | 799e309a7db032cb7abe9f0fa910c2989c3fdab5 /kernel/workqueue.c | |
| parent | 4d429480352c63db2228489f0db9fd381cdc3c9c (diff) | |
| parent | 6988f20fe04e9ef3aea488cb8ab57fbeb78e12f0 (diff) | |
Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
percpu: Unify input section names
percpu: Avoid extra NOP in percpu_cmpxchg16b_double
percpu: Cast away printk format warning
percpu: Always align percpu output section to PAGE_SIZE
Fix up fairly trivial conflict in arch/x86/include/asm/percpu.h as per Tejun
Diffstat (limited to 'kernel/workqueue.c')
| -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 e3378e8d3a5..0400553f0d0 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -2866,9 +2866,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; } |