Commit 0783ac95 authored Apr 20, 2020 by Hugh Dickins Committed by Linus Torvalds Apr 21, 2020

mm/shmem: fix build without THP



Some optimizers don't notice that shmem_punch_compound() is always true
(PageTransCompound() being false) without CONFIG_TRANSPARENT_HUGEPAGE==y.

Use IS_ENABLED to help them to avoid the BUILD_BUG inside HPAGE_PMD_NR.

Fixes: 71725ed1 ("mm: huge tmpfs: try to split_huge_page() when punching hole")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Link: http://lkml.kernel.org/r/alpine.LSU.2.11.2004142339170.10035@eggly.anvils


Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 56df70a6

mm/shmem.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -952,7 +952,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,
		VM_BUG_ON_PAGE(PageWriteback(page), page);
		if (shmem_punch_compound(page, start, end))
		truncate_inode_page(mapping, page);
		else {
		else if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) {
		/* Wipe the page and don't get stuck */
		clear_highpage(page);
		flush_dcache_page(page);

Admin message