diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-15 03:35:00 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-15 03:35:00 +0200 |
| commit | 989fa940961faa9d51f073bafa58c2b5653d5969 (patch) | |
| tree | 1d28774b8449b0a840b2cc396fd6229e7549fde2 /kernel | |
| parent | Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| parent | futexes: Fix infinite loop in get_futex_key() on huge page (diff) | |
| download | linux-989fa940961faa9d51f073bafa58c2b5653d5969.tar.xz linux-989fa940961faa9d51f073bafa58c2b5653d5969.zip | |
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: if (err < 0) return err; + page = compound_head(page); lock_page(page); if (!page->mapping) { unlock_page(page); |