git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
mips
/
include
/
asm
/
atomic.h
diff --git
a/arch/mips/include/asm/atomic.h
b/arch/mips/include/asm/atomic.h
index
dd75d67
..
519197e
100644
(file)
--- a/
arch/mips/include/asm/atomic.h
+++ b/
arch/mips/include/asm/atomic.h
@@
-137,7
+137,7
@@
static __inline__ int atomic_add_return(int i, atomic_t * v)
{
int result;
{
int result;
- smp_
llsc_mb
();
+ smp_
mb__before_llsc
();
if (kernel_uses_llsc && R10000_LLSC_WAR) {
int temp;
if (kernel_uses_llsc && R10000_LLSC_WAR) {
int temp;
@@
-189,7
+189,7
@@
static __inline__ int atomic_sub_return(int i, atomic_t * v)
{
int result;
{
int result;
- smp_
llsc_mb
();
+ smp_
mb__before_llsc
();
if (kernel_uses_llsc && R10000_LLSC_WAR) {
int temp;
if (kernel_uses_llsc && R10000_LLSC_WAR) {
int temp;
@@
-249,7
+249,7
@@
static __inline__ int atomic_sub_if_positive(int i, atomic_t * v)
{
int result;
{
int result;
- smp_
llsc_mb
();
+ smp_
mb__before_llsc
();
if (kernel_uses_llsc && R10000_LLSC_WAR) {
int temp;
if (kernel_uses_llsc && R10000_LLSC_WAR) {
int temp;
@@
-516,7
+516,7
@@
static __inline__ long atomic64_add_return(long i, atomic64_t * v)
{
long result;
{
long result;
- smp_
llsc_mb
();
+ smp_
mb__before_llsc
();
if (kernel_uses_llsc && R10000_LLSC_WAR) {
long temp;
if (kernel_uses_llsc && R10000_LLSC_WAR) {
long temp;
@@
-568,7
+568,7
@@
static __inline__ long atomic64_sub_return(long i, atomic64_t * v)
{
long result;
{
long result;
- smp_
llsc_mb
();
+ smp_
mb__before_llsc
();
if (kernel_uses_llsc && R10000_LLSC_WAR) {
long temp;
if (kernel_uses_llsc && R10000_LLSC_WAR) {
long temp;
@@
-628,7
+628,7
@@
static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v)
{
long result;
{
long result;
- smp_
llsc_mb
();
+ smp_
mb__before_llsc
();
if (kernel_uses_llsc && R10000_LLSC_WAR) {
long temp;
if (kernel_uses_llsc && R10000_LLSC_WAR) {
long temp;
@@
-788,9
+788,9
@@
static __inline__ int atomic64_add_unless(atomic64_t *v, long a, long u)
* atomic*_return operations are serializing but not the non-*_return
* versions.
*/
* atomic*_return operations are serializing but not the non-*_return
* versions.
*/
-#define smp_mb__before_atomic_dec() smp_
llsc_mb
()
+#define smp_mb__before_atomic_dec() smp_
mb__before_llsc
()
#define smp_mb__after_atomic_dec() smp_llsc_mb()
#define smp_mb__after_atomic_dec() smp_llsc_mb()
-#define smp_mb__before_atomic_inc() smp_
llsc_mb
()
+#define smp_mb__before_atomic_inc() smp_
mb__before_llsc
()
#define smp_mb__after_atomic_inc() smp_llsc_mb()
#include <asm-generic/atomic-long.h>
#define smp_mb__after_atomic_inc() smp_llsc_mb()
#include <asm-generic/atomic-long.h>