The patch titled Subject: mm/balloon_compaction: fix deflation when compaction is disabled has been added to the -mm tree. Its filename is mm-balloon_compaction-fix-deflation-when-compaction-is-disabled.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-balloon_compaction-fix-deflation-when-compaction-is-disabled.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-balloon_compaction-fix-deflation-when-compaction-is-disabled.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Konstantin Khlebnikov <k.khlebnikov@xxxxxxxxxxx> Subject: mm/balloon_compaction: fix deflation when compaction is disabled If CONFIG_BALLOON_COMPACTION=n balloon_page_insert() does not link pages with balloon and doesn't set PagePrivate flag, as a result balloon_page_dequeue() cannot get any pages because it thinks that all of them are isolated. Without balloon compaction nobody can isolate ballooned pages. It's safe to remove this check. Fixes: d6d86c0a7f8ddc ("mm/balloon_compaction: redesign ballooned pages management"). Signed-off-by: Konstantin Khlebnikov <k.khlebnikov@xxxxxxxxxxx> Reported-by: Matt Mullins <mmullins@xxxxxxx> Cc: <stable@xxxxxxxxxxxxxxx> [3.17] Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/balloon_compaction.c | 2 ++ 1 file changed, 2 insertions(+) diff -puN mm/balloon_compaction.c~mm-balloon_compaction-fix-deflation-when-compaction-is-disabled mm/balloon_compaction.c --- a/mm/balloon_compaction.c~mm-balloon_compaction-fix-deflation-when-compaction-is-disabled +++ a/mm/balloon_compaction.c @@ -68,11 +68,13 @@ struct page *balloon_page_dequeue(struct * to be released by the balloon driver. */ if (trylock_page(page)) { +#ifdef CONFIG_BALLOON_COMPACTION if (!PagePrivate(page)) { /* raced with isolation */ unlock_page(page); continue; } +#endif spin_lock_irqsave(&b_dev_info->pages_lock, flags); balloon_page_delete(page); __count_vm_event(BALLOON_DEFLATE); _ Patches currently in -mm which might be from k.khlebnikov@xxxxxxxxxxx are mm-balloon_compaction-fix-deflation-when-compaction-is-disabled.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html