aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-07-14 18:35:00 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-14 18:35:00 -0700
commit989fa940961faa9d51f073bafa58c2b5653d5969 (patch)
tree1d28774b8449b0a840b2cc396fd6229e7549fde2 /kernel
parentc0c50b541a4b147c5c2572ed051420238c47f57a (diff)
parentce2ae53b750abfaa012ce408e93da131a5b5649b (diff)
Merge branch 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: futexes: Fix infinite loop in get_futex_key() on huge page
Diffstat (limited to 'kernel')
-rw-r--r--kernel/futex.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index 794c862125f..0672ff88f15 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -247,6 +247,7 @@ again:
if (err < 0)
return err;
+ page = compound_head(page);
lock_page(page);
if (!page->mapping) {
unlock_page(page);