diff --git a/[refs] b/[refs] index fc7056d0a4a5..0c4ff14fd672 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e384bd1692bab6a1d9aa40c849ac373a68769de2 +refs/heads/master: ccdea2f88b5689f0fd29c3804be43a3acf0311e3 diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c index d60b7f7a8cc3..a8302a1620ea 100644 --- a/trunk/kernel/futex.c +++ b/trunk/kernel/futex.c @@ -552,7 +552,7 @@ static void wake_futex(struct futex_q *q) * at the end of wake_up_all() does not prevent this store from * moving. */ - wmb(); + smp_wmb(); q->lock_ptr = NULL; }