From: Andrew Morton <akpm@linux-foundation.org>

Cc: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/asm-mips/local.h |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff -puN include/asm-mips/local.h~local_t-mips-extension-shrink-duplicated-mips-32-64-bits-functions-from-localh-fix include/asm-mips/local.h
--- a/include/asm-mips/local.h~local_t-mips-extension-shrink-duplicated-mips-32-64-bits-functions-from-localh-fix
+++ a/include/asm-mips/local.h
@@ -13,13 +13,13 @@ typedef struct
 
 #define LOCAL_INIT(i)	{ local_LONG_INIT(i) }
 
-#define local_read(l)	local_long_read(&(l)->a)
-#define local_set(l,i)	local_long_set(&(l)->a, (i))
+#define local_read(l)	atomic_long_read(&(l)->a)
+#define local_set(l,i)	atomic_long_set(&(l)->a, (i))
 
-#define local_add(i,l)	local_long_add((i),(&(l)->a))
-#define local_sub(i,l)	local_long_sub((i),(&(l)->a))
-#define local_inc(l)	local_long_inc(&(l)->a)
-#define local_dec(l)	local_long_dec(&(l)->a)
+#define local_add(i,l)	atomic_long_add((i),(&(l)->a))
+#define local_sub(i,l)	atomic_long_sub((i),(&(l)->a))
+#define local_inc(l)	atomic_long_inc(&(l)->a)
+#define local_dec(l)	atomic_long_dec(&(l)->a)
 
 /*
  * Same as above, but return the result value
_