From patchwork Fri Nov 9 02:20:59 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: solomon X-Patchwork-Id: 197917 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 F056F2C008F for ; Fri, 9 Nov 2012 13:22:53 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757511Ab2KICVI (ORCPT ); Thu, 8 Nov 2012 21:21:08 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:59862 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757066Ab2KICVE (ORCPT ); Thu, 8 Nov 2012 21:21:04 -0500 Received: by mail-pa0-f46.google.com with SMTP id hz1so2429230pad.19 for ; Thu, 08 Nov 2012 18:21:04 -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=UOrZO0Q+w5lXL+81vlIY+g7lI4EkBr1RIWeRd357MOY=; b=dozChT047mpTYiGMk3RQ6QJxROXHdjRYXTkrIRQAEIY0HKDgVTD1D0z/A6VwAp8KDi 2RZlonZ5lffU02xMIDxOX8tFyT8NZPDEiSnGh54Yt9iRWpVIb+yIYdvTA9Pr8qGpkP1O 5hf3PrN1/lzuU8a7A7Ch44ZbBrXdB5bSn83aBM6pjPwPMzpF2mCihqTT3hIUFbDmdsZV X8IrlPPCKycbdOKrVVL8mwF+ZQpLHbcfq52hsw2+NgZOJgsaHcM9rXBPhIgywObXXy9e swW0Q8Vvroike9wIdFlEpdMTqISjTQfXN/foRfxXnHZCuBjFMhUKnKnUXi+gorE8xoPD e7Kw== Received: by 10.68.209.170 with SMTP id mn10mr22994709pbc.11.1352427663987; Thu, 08 Nov 2012 18:21:03 -0800 (PST) Received: from [172.30.10.127] ([112.95.138.22]) by mx.google.com with ESMTPS id o10sm17061953paz.37.2012.11.08.18.21.00 (version=SSLv3 cipher=OTHER); Thu, 08 Nov 2012 18:21:03 -0800 (PST) Message-ID: <509C688B.5010502@gmail.com> Date: Fri, 09 Nov 2012 10:20:59 +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 v3 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 --- v3 fix compile warning: net/xfrm/xfrm_ipcomp.c: In function 'ipcomp_alloc_tfms': net/xfrm/xfrm_ipcomp.c:285: warning: assignment from incompatible pointer type --- net/xfrm/xfrm_ipcomp.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c index e5246fb..898c899 100644 --- a/net/xfrm/xfrm_ipcomp.c +++ b/net/xfrm/xfrm_ipcomp.c @@ -276,18 +276,15 @@ 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); + tfm = (struct crypto_comp *) __this_cpu_read(pos->tfms); if (!strcmp(crypto_comp_name(tfm), alg_name)) { pos->users++; - return tfms; + return pos->tfms; } }