aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorSteven Rostedt (Red Hat) <rostedt@goodmis.org>2014-10-31 14:59:11 -0400
committerSteven Rostedt <rostedt@goodmis.org>2014-10-31 14:59:11 -0400
commitaf33ed9506b5befa9aec107f970f5b5ccaba49b9 (patch)
treec61e242664be9fd137fc11f9f572dd8ce745de05 /kernel
parentcaf8dfd4e5326fefab51f22231140f88ba6abbd5 (diff)
parentcd2c5381cba9b0c40519b25841315621738688a0 (diff)
Merge tag 'v3.14.23' into v3.14-rt
This is the 3.14.23 stable release
Diffstat (limited to 'kernel')
-rw-r--r--kernel/futex.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index dcf45b6570e1..5ba3c0fc4d19 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -329,6 +329,8 @@ static void get_futex_key_refs(union futex_key *key)
case FUT_OFF_MMSHARED:
futex_get_mm(key); /* implies MB (B) */
break;
+ default:
+ smp_mb(); /* explicit MB (B) */
}
}