diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-14 21:35:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-14 21:35:00 -0400 |
| commit | 989fa940961faa9d51f073bafa58c2b5653d5969 (patch) | |
| tree | 1d28774b8449b0a840b2cc396fd6229e7549fde2 /kernel | |
| parent | c0c50b541a4b147c5c2572ed051420238c47f57a (diff) | |
| parent | ce2ae53b750abfaa012ce408e93da131a5b5649b (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.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 794c862125fe..0672ff88f159 100644 --- a/kernel/futex.c +++ b/kernel/futex.c | |||
| @@ -247,6 +247,7 @@ again: | |||
| 247 | if (err < 0) | 247 | if (err < 0) |
| 248 | return err; | 248 | return err; |
| 249 | 249 | ||
| 250 | page = compound_head(page); | ||
| 250 | lock_page(page); | 251 | lock_page(page); |
| 251 | if (!page->mapping) { | 252 | if (!page->mapping) { |
| 252 | unlock_page(page); | 253 | unlock_page(page); |