2 files changed, 18 insertions, 18 deletions

diff --git a/include/linux/rwlock.h b/include/linux/rwlock.h
index 73785b0bd6b9..5725b034defe 100644
--- a/include/linux/rwlock.h
+++ b/include/linux/rwlock.h
@@ -38,20 +38,20 @@ do {								\
  extern int _raw_write_trylock(rwlock_t *lock);
  extern void _raw_write_unlock(rwlock_t *lock);
 #else
-# define _raw_read_lock(rwlock)         __raw_read_lock(&(rwlock)->raw_lock)
+# define _raw_read_lock(rwlock)         arch_read_lock(&(rwlock)->raw_lock)
 # define _raw_read_lock_flags(lock, flags) \
-                __raw_read_lock_flags(&(lock)->raw_lock, *(flags))
-# define _raw_read_trylock(rwlock)      __raw_read_trylock(&(rwlock)->raw_lock)
-# define _raw_read_unlock(rwlock)       __raw_read_unlock(&(rwlock)->raw_lock)
-# define _raw_write_lock(rwlock)        __raw_write_lock(&(rwlock)->raw_lock)
+                arch_read_lock_flags(&(lock)->raw_lock, *(flags))
+# define _raw_read_trylock(rwlock)      arch_read_trylock(&(rwlock)->raw_lock)
+# define _raw_read_unlock(rwlock)       arch_read_unlock(&(rwlock)->raw_lock)
+# define _raw_write_lock(rwlock)        arch_write_lock(&(rwlock)->raw_lock)
 # define _raw_write_lock_flags(lock, flags) \
-                __raw_write_lock_flags(&(lock)->raw_lock, *(flags))
-# define _raw_write_trylock(rwlock)     __raw_write_trylock(&(rwlock)->raw_lock)
-# define _raw_write_unlock(rwlock)      __raw_write_unlock(&(rwlock)->raw_lock)
+                arch_write_lock_flags(&(lock)->raw_lock, *(flags))
+# define _raw_write_trylock(rwlock)     arch_write_trylock(&(rwlock)->raw_lock)
+# define _raw_write_unlock(rwlock)      arch_write_unlock(&(rwlock)->raw_lock)
 #endif
 
-#define read_can_lock(rwlock)           __raw_read_can_lock(&(rwlock)->raw_lock)
-#define write_can_lock(rwlock)          __raw_write_can_lock(&(rwlock)->raw_lock)
+#define read_can_lock(rwlock)           arch_read_can_lock(&(rwlock)->raw_lock)
+#define write_can_lock(rwlock)          arch_write_can_lock(&(rwlock)->raw_lock)
 
 /*
  * Define the various rw_lock methods.  Note we define these
diff --git a/include/linux/spinlock_up.h b/include/linux/spinlock_up.h
index 1d3bcc3cf7c6..b14f6a91e19f 100644
--- a/include/linux/spinlock_up.h
+++ b/include/linux/spinlock_up.h
@@ -49,12 +49,12 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)
 /*
  * Read-write spinlocks. No debug version.
  */
-#define __raw_read_lock(lock)           do { (void)(lock); } while (0)
-#define __raw_write_lock(lock)          do { (void)(lock); } while (0)
-#define __raw_read_trylock(lock)        ({ (void)(lock); 1; })
-#define __raw_write_trylock(lock)       ({ (void)(lock); 1; })
-#define __raw_read_unlock(lock)         do { (void)(lock); } while (0)
-#define __raw_write_unlock(lock)        do { (void)(lock); } while (0)
+#define arch_read_lock(lock)            do { (void)(lock); } while (0)
+#define arch_write_lock(lock)           do { (void)(lock); } while (0)
+#define arch_read_trylock(lock) ({ (void)(lock); 1; })
+#define arch_write_trylock(lock)        ({ (void)(lock); 1; })
+#define arch_read_unlock(lock)          do { (void)(lock); } while (0)
+#define arch_write_unlock(lock) do { (void)(lock); } while (0)
 
 #else /* DEBUG_SPINLOCK */
 #define arch_spin_is_locked(lock)       ((void)(lock), 0)
@@ -67,8 +67,8 @@ static inline void arch_spin_unlock(arch_spinlock_t *lock)
 
 #define arch_spin_is_contended(lock)    (((void)(lock), 0))
 
-#define __raw_read_can_lock(lock)       (((void)(lock), 1))
-#define __raw_write_can_lock(lock)      (((void)(lock), 1))
+#define arch_read_can_lock(lock)        (((void)(lock), 1))
+#define arch_write_can_lock(lock)       (((void)(lock), 1))
 
 #define arch_spin_unlock_wait(lock) \
                 do { cpu_relax(); } while (arch_spin_is_locked(lock))