aboutsummaryrefslogtreecommitdiff
path: root/lib/kstrtox.c
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2011-04-14 15:41:57 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-21 14:32:41 -0700
commitdb06752c7f64c445aeae2ae520a48c35e78789ed (patch)
tree0f04cef17793dcd7e5c008f862253327ee225e99 /lib/kstrtox.c
parent5b00f4b47e31f38c965143036b37f3b436083fc2 (diff)
downloadlinux-linaro-android-db06752c7f64c445aeae2ae520a48c35e78789ed.tar.gz
futex: Set FLAGS_HAS_TIMEOUT during futex_wait restart setup
commit 0cd9c6494ee5c19aef085152bc37f3a4e774a9e1 upstream. The FLAGS_HAS_TIMEOUT flag was not getting set, causing the restart_block to restart futex_wait() without a timeout after a signal. Commit b41277dc7a18ee332d in 2.6.38 introduced the regression by accidentally removing the the FLAGS_HAS_TIMEOUT assignment from futex_wait() during the setup of the restart block. Restore the originaly behavior. Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=32922 Reported-by: Tim Smith <tsmith201104@yahoo.com> Reported-by: Torsten Hilbrich <torsten.hilbrich@secunet.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: John Kacur <jkacur@redhat.com> Link: http://lkml.kernel.org/r/%3Cdaac0eb3af607f72b9a4d3126b2ba8fb5ed3b883.1302820917.git.dvhart%40linux.intel.com%3E Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'lib/kstrtox.c')
0 files changed, 0 insertions, 0 deletions