diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-07 06:38:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-07 06:38:41 -0400 |
| commit | 242898be7a1921f646ca529ddc26d7337c69922f (patch) | |
| tree | 674adf64ca6254318dab5bcd428ebe8ac73957ff /kernel/futex.c | |
| parent | 6bbad18a8b18228fa65d73547dfd5efad1515ef8 (diff) | |
| parent | 9f737633e6ee54fc174282d49b2559bd2208391d (diff) | |
Merge branch 'master' 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 | /* |