git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[pandora-kernel.git]
/
kernel
/
futex.c
diff --git
a/kernel/futex.c
b/kernel/futex.c
index
6570c45
..
fe28dc2
100644
(file)
--- a/
kernel/futex.c
+++ b/
kernel/futex.c
@@
-782,8
+782,8
@@
static void __unqueue_futex(struct futex_q *q)
{
struct futex_hash_bucket *hb;
{
struct futex_hash_bucket *hb;
- if (WARN_ON
(!q->lock_ptr || !spin_is_locked(q->lock_ptr
)
-
||
plist_node_empty(&q->list)))
+ if (WARN_ON
_SMP(!q->lock_ptr || !spin_is_locked(q->lock_ptr)
)
+
|| WARN_ON(
plist_node_empty(&q->list)))
return;
hb = container_of(q->lock_ptr, struct futex_hash_bucket, lock);
return;
hb = container_of(q->lock_ptr, struct futex_hash_bucket, lock);
@@
-1886,7
+1886,7
@@
retry:
restart->futex.val = val;
restart->futex.time = abs_time->tv64;
restart->futex.bitset = bitset;
restart->futex.val = val;
restart->futex.time = abs_time->tv64;
restart->futex.bitset = bitset;
- restart->futex.flags = flags;
+ restart->futex.flags = flags
| FLAGS_HAS_TIMEOUT
;
ret = -ERESTART_RESTARTBLOCK;
ret = -ERESTART_RESTARTBLOCK;