Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux

[deliverable/linux.git] / kernel / futex.c

diff --git a/kernel/futex.c b/kernel/futex.c
index de938d20df19799853560e06ba9b208752578b62..b632b5f3f09408e8e5cc8eadce4630a333db2750 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -267,7 +267,7 @@ static inline void futex_get_mm(union futex_key *key)
         * get_futex_key() implies a full barrier. This is relied upon
         * as full barrier (B), see the ordering comment above.
         */
-       smp_mb__after_atomic_inc();
+       smp_mb__after_atomic();
 }
 
 /*
@@ -280,7 +280,7 @@ static inline void hb_waiters_inc(struct futex_hash_bucket *hb)
        /*
         * Full barrier (A), see the ordering comment above.
         */
-       smp_mb__after_atomic_inc();
+       smp_mb__after_atomic();
 #endif
 }