From 138e90621b0cfc825f3c862230815df37b8af877 Mon Sep 17 00:00:00 2001 From: David Howells Date: Mon, 25 Oct 2010 23:41:11 +0100 Subject: [PATCH] --- yaml --- r: 217092 b: refs/heads/master c: 5260562754c0aa4b95eebb1f851eaccce7286365 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mn10300/kernel/vmlinux.lds.S | 2 +- trunk/kernel/workqueue.c | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 440559d24a3c..a9f11e6e6d9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74eb94b218d087798a52c0b4f1379b635287a4b8 +refs/heads/master: 5260562754c0aa4b95eebb1f851eaccce7286365 diff --git a/trunk/arch/mn10300/kernel/vmlinux.lds.S b/trunk/arch/mn10300/kernel/vmlinux.lds.S index 10549dcfb610..febbeee7f2f5 100644 --- a/trunk/arch/mn10300/kernel/vmlinux.lds.S +++ b/trunk/arch/mn10300/kernel/vmlinux.lds.S @@ -70,7 +70,7 @@ SECTIONS .exit.text : { EXIT_TEXT; } .exit.data : { EXIT_DATA; } - PERCPU(32) + PERCPU(PAGE_SIZE) . = ALIGN(PAGE_SIZE); __init_end = .; /* freed after init ends here */ diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c index 30acdb74cc23..e5ff2cbaadc2 100644 --- a/trunk/kernel/workqueue.c +++ b/trunk/kernel/workqueue.c @@ -2791,7 +2791,9 @@ static int alloc_cwqs(struct workqueue_struct *wq) } } - /* just in case, make sure it's actually aligned */ + /* just in case, make sure it's actually aligned + * - this is affected by PERCPU() alignment in vmlinux.lds.S + */ BUG_ON(!IS_ALIGNED(wq->cpu_wq.v, align)); return wq->cpu_wq.v ? 0 : -ENOMEM; }