From patchwork Tue Nov 13 01:52:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: solomon X-Patchwork-Id: 198519 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C1EA32C0095 for ; Tue, 13 Nov 2012 12:52:38 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754510Ab2KMBwV (ORCPT ); Mon, 12 Nov 2012 20:52:21 -0500 Received: from mail-da0-f46.google.com ([209.85.210.46]:36812 "EHLO mail-da0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752751Ab2KMBwS (ORCPT ); Mon, 12 Nov 2012 20:52:18 -0500 Received: by mail-da0-f46.google.com with SMTP id n41so2992007dak.19 for ; Mon, 12 Nov 2012 17:52:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; bh=LNEmjgGsfUFCUP18Jq/4gNJVek5XyhuDTMhBbPFUQPc=; b=h+vpvHuTQyz7CnWxy89AKuCsn996bnKS1jMmdhZBZrvWT8yoawXfSW3YOW5Fgku9II dIzO71BzccL2cysxWdRRM5BDuo6Sh7THyUSRYRQ73mU73zaqbZI4nqcAYconkFgKGDkO w0pwxRZrX8Y06eKGGofIKB+zc5THqo3I85rMS19R6fsryUo94dfqfRS/G8XkOTZvLyqi ZnDLYoTopKZmIheFXBApxfpEwHKW0YM5nNlmtlIDE7AzwgkxxJqCRQLfdl/tzKW8zk6w /WSR+SAsxrENM3UoGmBQgAAT55f7aQvNUPbpbXpO1FaIUEwpAa1p9s5LScL+wZDunyZN j6LQ== Received: by 10.66.79.198 with SMTP id l6mr53733661pax.43.1352771538180; Mon, 12 Nov 2012 17:52:18 -0800 (PST) Received: from [172.30.10.127] ([121.14.96.125]) by mx.google.com with ESMTPS id s1sm5210956paz.0.2012.11.12.17.52.12 (version=SSLv3 cipher=OTHER); Mon, 12 Nov 2012 17:52:17 -0800 (PST) Message-ID: <50A1A7C9.3060703@gmail.com> Date: Tue, 13 Nov 2012 09:52:09 +0800 From: Shan Wei User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:16.0) Gecko/20121026 Thunderbird/16.0.2 MIME-Version: 1.0 To: steffen.klassert@secunet.com, David Miller , NetDev , Herbert Xu , Kernel-Maillist , cl@linux-foundation.org, Shan Wei Subject: [PATCH v4 3/9] net: xfrm: use __this_cpu_read per-cpu helper Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Shan Wei Signed-off-by: Shan Wei --- v4: derefrence pointer before reading to avoid compile warning. --- net/xfrm/xfrm_ipcomp.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c index e5246fb..2906d52 100644 --- a/net/xfrm/xfrm_ipcomp.c +++ b/net/xfrm/xfrm_ipcomp.c @@ -276,18 +276,16 @@ static struct crypto_comp * __percpu *ipcomp_alloc_tfms(const char *alg_name) struct crypto_comp * __percpu *tfms; int cpu; - /* This can be any valid CPU ID so we don't need locking. */ - cpu = raw_smp_processor_id(); list_for_each_entry(pos, &ipcomp_tfms_list, list) { struct crypto_comp *tfm; - tfms = pos->tfms; - tfm = *per_cpu_ptr(tfms, cpu); + /* This can be any valid CPU ID so we don't need locking. */ + tfm = __this_cpu_read(*pos->tfms); if (!strcmp(crypto_comp_name(tfm), alg_name)) { pos->users++; - return tfms; + return pos->tfms; } }