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
b43: bus: abstract bus and core operations
[pandora-kernel.git]
/
kernel
/
futex.c
diff --git
a/kernel/futex.c
b/kernel/futex.c
index
dfb924f
..
fe28dc2
100644
(file)
--- a/
kernel/futex.c
+++ b/
kernel/futex.c
@@
-1886,7
+1886,7
@@
retry:
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;