diff options
Diffstat (limited to 'include/asm-generic/mutex-xchg.h')
-rw-r--r-- | include/asm-generic/mutex-xchg.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/asm-generic/mutex-xchg.h b/include/asm-generic/mutex-xchg.h index 7b9cd2cbfebe..580a6d35c700 100644 --- a/include/asm-generic/mutex-xchg.h +++ b/include/asm-generic/mutex-xchg.h | |||
@@ -27,8 +27,6 @@ __mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *)) | |||
27 | { | 27 | { |
28 | if (unlikely(atomic_xchg(count, 0) != 1)) | 28 | if (unlikely(atomic_xchg(count, 0) != 1)) |
29 | fail_fn(count); | 29 | fail_fn(count); |
30 | else | ||
31 | smp_mb(); | ||
32 | } | 30 | } |
33 | 31 | ||
34 | /** | 32 | /** |
@@ -46,10 +44,7 @@ __mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *)) | |||
46 | { | 44 | { |
47 | if (unlikely(atomic_xchg(count, 0) != 1)) | 45 | if (unlikely(atomic_xchg(count, 0) != 1)) |
48 | return fail_fn(count); | 46 | return fail_fn(count); |
49 | else { | 47 | return 0; |
50 | smp_mb(); | ||
51 | return 0; | ||
52 | } | ||
53 | } | 48 | } |
54 | 49 | ||
55 | /** | 50 | /** |
@@ -67,7 +62,6 @@ __mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *)) | |||
67 | static inline void | 62 | static inline void |
68 | __mutex_fastpath_unlock(atomic_t *count, void (*fail_fn)(atomic_t *)) | 63 | __mutex_fastpath_unlock(atomic_t *count, void (*fail_fn)(atomic_t *)) |
69 | { | 64 | { |
70 | smp_mb(); | ||
71 | if (unlikely(atomic_xchg(count, 1) != 0)) | 65 | if (unlikely(atomic_xchg(count, 1) != 0)) |
72 | fail_fn(count); | 66 | fail_fn(count); |
73 | } | 67 | } |
@@ -110,7 +104,6 @@ __mutex_fastpath_trylock(atomic_t *count, int (*fail_fn)(atomic_t *)) | |||
110 | if (prev < 0) | 104 | if (prev < 0) |
111 | prev = 0; | 105 | prev = 0; |
112 | } | 106 | } |
113 | smp_mb(); | ||
114 | 107 | ||
115 | return prev; | 108 | return prev; |
116 | } | 109 | } |