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
This commit is contained in:
Linus Torvalds 2009-07-14 18:35:00 -07:00
commit 989fa94096

View File

@ -247,6 +247,7 @@ again:
if (err < 0) if (err < 0)
return err; return err;
page = compound_head(page);
lock_page(page); lock_page(page);
if (!page->mapping) { if (!page->mapping) {
unlock_page(page); unlock_page(page);