From patchwork Wed Sep 9 01:27:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boqun Feng X-Patchwork-Id: 515661 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 20FBF140497 for ; Wed, 9 Sep 2015 11:28:25 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=SyPY1E/k; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753982AbbIIB1q (ORCPT ); Tue, 8 Sep 2015 21:27:46 -0400 Received: from mail-ig0-f196.google.com ([209.85.213.196]:36719 "EHLO mail-ig0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753303AbbIIB1o (ORCPT ); Tue, 8 Sep 2015 21:27:44 -0400 Received: by igcxw12 with SMTP id xw12so502054igc.3; Tue, 08 Sep 2015 18:27:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=ObsZGV7tW6NS7RNylB34KNeL14CAGKANQCMFKWtY+9I=; b=SyPY1E/kgXlO0NkDjYsG4Sof3DwCa4QMZnVcwUDCa5PtgJcchvbNx3+l4vIvXmq1Lq pR/CleYS2/fdSwZ/NHy6kk6pawOt9gTFD4/xnXJD045aensnbYc4aMg6CHyZIqygEop7 exxPcW3y90tyoapO5ZUm3xF5620Z898DG08Ywgr5XPydfw6Pz6hSkrOINYzE/ZpKda6k WDld3l7hCogVKbQ7azyf9KaYgEz2sv3nDbq9wmMc4lT4/d1ZTYnUWPMPwyq3XipubVyg +GGGwFB5ulYN3TlSHL/4QCnLiKcAPhOfxl1jrqQSBqwQFb510s8Ncc/AyuFCUbofbJzG 0eIQ== X-Received: by 10.50.79.133 with SMTP id j5mr47305785igx.15.1441762062086; Tue, 08 Sep 2015 18:27:42 -0700 (PDT) Received: from localhost (vm.fixme.name. [192.157.208.129]) by smtp.gmail.com with ESMTPSA id d8sm654668igl.13.2015.09.08.18.27.39 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Sep 2015 18:27:40 -0700 (PDT) From: Boqun Feng To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , Ingo Molnar , Will Deacon , Jonathan Corbet , Shradha Shah , Kishon Vijay Abraham I , William Hubbs , Chris Brannon , Kirk Reiser , Samuel Thibault , Greg Kroah-Hartman , Aybuke Ozdemir , Davidlohr Bueso , linux-net-drivers@solarflare.com, linux-doc@vger.kernel.org, netdev@vger.kernel.org, speakup@linux-speakup.org, devel@driverdev.osuosl.org, Boqun Feng Subject: [PATCH v2] atomics, cmpxchg: Privatize the inclusion of asm/cmpxchg.h Date: Wed, 9 Sep 2015 09:27:04 +0800 Message-Id: <1441762024-2081-1-git-send-email-boqun.feng@gmail.com> X-Mailer: git-send-email 2.5.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org After commit: atomics: add acquire/release/relaxed variants of some atomic operations Architectures may only provide {cmp,}xchg_relaxed definitions in asm/cmpxchg.h. Other variants, such as {cmp,}xchg, may be built in linux/atomic.h, which means simply including asm/cmpxchg.h may not get the definitions of all the{cmp,}xchg variants. Therefore, we should privatize the inclusions of asm/cmpxchg.h to keep it only included in arch/* and replace the inclusions outside with linux/atomic.h Acked-by: Will Deacon Signed-off-by: Boqun Feng Acked-by: Greg Kroah-Hartman Acked-by: Davidlohr Bueso --- v1 --> v2: 1. rebase on current master branch of tip tree 2. remove documentation modification drivers/net/ethernet/sfc/mcdi.c | 2 +- drivers/phy/phy-rcar-gen2.c | 3 +-- drivers/staging/speakup/selection.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/sfc/mcdi.c b/drivers/net/ethernet/sfc/mcdi.c index 81640f8..968383e 100644 --- a/drivers/net/ethernet/sfc/mcdi.c +++ b/drivers/net/ethernet/sfc/mcdi.c @@ -9,7 +9,7 @@ #include #include -#include +#include #include "net_driver.h" #include "nic.h" #include "io.h" diff --git a/drivers/phy/phy-rcar-gen2.c b/drivers/phy/phy-rcar-gen2.c index 6e0d9fa..c7a0599 100644 --- a/drivers/phy/phy-rcar-gen2.c +++ b/drivers/phy/phy-rcar-gen2.c @@ -17,8 +17,7 @@ #include #include #include - -#include +#include #define USBHS_LPSTS 0x02 #define USBHS_UGCTRL 0x80 diff --git a/drivers/staging/speakup/selection.c b/drivers/staging/speakup/selection.c index 98af3b1..aa5ab6c 100644 --- a/drivers/staging/speakup/selection.c +++ b/drivers/staging/speakup/selection.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include "speakup.h"