diff options
| author | Mark Brown <broonie@kernel.org> | 2014-10-31 09:45:06 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-10-31 09:45:06 +0000 |
| commit | 4542f75889361f995d2afc26e07a1272805280ea (patch) | |
| tree | 7505db5a21a6d6ce074e37499c29b9cd92f53820 /kernel | |
| parent | 944cdcda15d461c87e6310694bdb8371a88ac7ff (diff) | |
| parent | 5bca889af9ee712d0dac3b61b1cec79e7c99ec58 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/futex.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 0b0dc02aabce..fda2950f2ce4 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) */ } } |