futex fix

Linus,

Please pull the latest core-fixes-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-fixes-for-linus

Thanks,

Ingo

------------------>
Darren Hart (1):
futex: Set FLAGS_HAS_TIMEOUT during futex_wait restart setup

 kernel/futex.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index dfb924f..fe28dc2 100644
@@ -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;