diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-14 15:33:54 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-14 15:33:54 -0400 |
| commit | e9ffb3d7ec94083a44a8721681391beca2ffd68c (patch) | |
| tree | 6768ab487b3f44c2a4995ee61307e47760ca9b88 /kernel/futex.c | |
| parent | 8b9411014e6f18a883c18b38f41338dbd53fddea (diff) | |
| parent | e9fa4f7bd291c29a785666e2fa5a9cf3241ee6c3 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'kernel/futex.c')
| -rw-r--r-- | kernel/futex.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index dda2049692a2..c2b2e0b83abf 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
| @@ -948,6 +948,7 @@ static int unqueue_me(struct futex_q *q) | |||
| 948 | /* In the common case we don't take the spinlock, which is nice. */ | 948 | /* In the common case we don't take the spinlock, which is nice. */ |
| 949 | retry: | 949 | retry: |
| 950 | lock_ptr = q->lock_ptr; | 950 | lock_ptr = q->lock_ptr; |
| 951 | barrier(); | ||
| 951 | if (lock_ptr != 0) { | 952 | if (lock_ptr != 0) { |
| 952 | spin_lock(lock_ptr); | 953 | spin_lock(lock_ptr); |
| 953 | /* | 954 | /* |