From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964891Ab2CTKQk (ORCPT ); Tue, 20 Mar 2012 06:16:40 -0400 Received: from cn.fujitsu.com ([222.73.24.84]:50632 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1754045Ab2CTKQZ (ORCPT ); Tue, 20 Mar 2012 06:16:25 -0400 X-IronPort-AV: E=Sophos;i="4.73,617,1325433600"; d="scan'208";a="4579995" From: Lai Jiangshan To: Christoph Lameter , Pekka Enberg , Matt Mackall , Tejun Heo , Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Lai Jiangshan Subject: [RFC PATCH 6/6] workqueue: use kmalloc_align() instead of hacking Date: Tue, 20 Mar 2012 18:21:24 +0800 Message-Id: <1332238884-6237-7-git-send-email-laijs@cn.fujitsu.com> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1332238884-6237-1-git-send-email-laijs@cn.fujitsu.com> References: <1332238884-6237-1-git-send-email-laijs@cn.fujitsu.com> X-MIMETrack: Itemize by SMTP Server on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2012-03-20 18:14:11, Serialize by Router on mailserver/fnst(Release 8.5.1FP4|July 25, 2010) at 2012-03-20 18:14:14, Serialize complete at 2012-03-20 18:14:14 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org kmalloc_align() makes the code simpler. Signed-off-by: Lai Jiangshan --- kernel/workqueue.c | 23 +++++------------------ 1 files changed, 5 insertions(+), 18 deletions(-) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index 5abf42f..beec5fd 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -2897,20 +2897,9 @@ static int alloc_cwqs(struct workqueue_struct *wq) if (!(wq->flags & WQ_UNBOUND)) wq->cpu_wq.pcpu = __alloc_percpu(size, align); - else { - void *ptr; - - /* - * Allocate enough room to align cwq and put an extra - * pointer at the end pointing back to the originally - * allocated pointer which will be used for free. - */ - ptr = kzalloc(size + align + sizeof(void *), GFP_KERNEL); - if (ptr) { - wq->cpu_wq.single = PTR_ALIGN(ptr, align); - *(void **)(wq->cpu_wq.single + 1) = ptr; - } - } + else + wq->cpu_wq.single = kmalloc_align(size, + GFP_KERNEL | __GFP_ZERO, align); /* just in case, make sure it's actually aligned */ BUG_ON(!IS_ALIGNED(wq->cpu_wq.v, align)); @@ -2921,10 +2910,8 @@ static void free_cwqs(struct workqueue_struct *wq) { if (!(wq->flags & WQ_UNBOUND)) free_percpu(wq->cpu_wq.pcpu); - else if (wq->cpu_wq.single) { - /* the pointer to free is stored right after the cwq */ - kfree(*(void **)(wq->cpu_wq.single + 1)); - } + else if (wq->cpu_wq.single) + kfree(wq->cpu_wq.single); } static int wq_clamp_max_active(int max_active, unsigned int flags, -- 1.7.4.4