Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84567995 authored by Boqun Feng's avatar Boqun Feng Committed by Ingo Molnar
Browse files

locking/atomics, cmpxchg: Privatize the inclusion of asm/cmpxchg.h 



After commit:

  654672d4 ("locking/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

Signed-off-by: default avatarBoqun Feng <boqun.feng@gmail.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Aybuke Ozdemir <aybuke.147@gmail.com>
Cc: Chris Brannon <chris@the-brannons.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Kirk Reiser <kirk@reisers.ca>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Shradha Shah <sshah@solarflare.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: William Hubbs <w.d.hubbs@gmail.com>
Cc: devel@driverdev.osuosl.org
Cc: linux-net-drivers@solarflare.com
Cc: speakup@linux-speakup.org
Link: http://lkml.kernel.org/r/1440589966-26280-1-git-send-email-boqun.feng@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent c7ef92ce

Documentation/atomic_ops.txt

+4 −0
Original line number Diff line number Diff line
@@ -542,6 +542,10 @@ The routines xchg() and cmpxchg() must provide the same exact 
memory-barrier semantics as the atomic and bit operations returning

values.



Note: If someone wants to use xchg(), cmpxchg() and their variants,

linux/atomic.h should be included rather than asm/cmpxchg.h, unless

the code is in arch/* and can take care of itself.



Spinlocks and rwlocks have memory barrier expectations as well.

The rule to follow is simple:

drivers/net/ethernet/sfc/mcdi.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


#include <linux/delay.h>

#include <linux/moduleparam.h>

#include <asm/cmpxchg.h>

#include <linux/atomic.h>

#include "net_driver.h"

#include "nic.h"

#include "io.h"

drivers/phy/phy-rcar-gen2.c

+1 −2
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ 
#include <linux/phy/phy.h>

#include <linux/platform_device.h>

#include <linux/spinlock.h>



#include <asm/cmpxchg.h>

#include <linux/atomic.h>



#define USBHS_LPSTS			0x02

#define USBHS_UGCTRL			0x80

drivers/staging/speakup/selection.c

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#include <linux/workqueue.h>

#include <linux/tty.h>

#include <linux/tty_flip.h>

#include <asm/cmpxchg.h>

#include <linux/atomic.h>



#include "speakup.h"