diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-07-20 16:08:14 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-07-20 16:08:14 +0800 |
| commit | 1d508e233d21a7848cf54d7d03b40dac2d9ea873 (patch) | |
| tree | eec5222580c4bca752ae35d5cef3842166e6f8c8 /kernel/futex.c | |
| parent | 439863d92fda525a8f3b326a24490e91c70f0496 (diff) | |
| parent | 5880876e94699ce010554f483ccf0009997955ca (diff) | |
Merge remote-tracking branch 'lts/linux-4.1.y' into linux-linaro-lsk-v4.1lsk-v4.1-16.07
Conflicts:
pick up 45d1abd9de arm64: Use PoU cache instr for I/D coherency
in arch/arm64/mm/flush.c
Diffstat (limited to 'kernel/futex.c')
| -rw-r--r-- | kernel/futex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 46b168e19c98..2214b70f1910 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1381,8 +1381,8 @@ void requeue_futex(struct futex_q *q, struct futex_hash_bucket *hb1, if (likely(&hb1->chain != &hb2->chain)) { plist_del(&q->list, &hb1->chain); hb_waiters_dec(hb1); - plist_add(&q->list, &hb2->chain); hb_waiters_inc(hb2); + plist_add(&q->list, &hb2->chain); q->lock_ptr = &hb2->lock; } get_futex_key_refs(key2); |