Commit 77d6b909 authored Apr 01, 2020 by Matthew Wilcox (Oracle) Committed by Linus Torvalds Apr 02, 2020

include/linux/huge_mm.h: check PageTail in hpage_nr_pages even when !THP



It's even more important to check that we don't have a tail page when
calling hpage_nr_pages() when THP are disabled.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Pankaj Gupta <pankaj.gupta.linux@gmail.com>
Link: http://lkml.kernel.org/r/20200318140253.6141-4-willy@infradead.org


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

parent bb297bb2

include/linux/huge_mm.h

+5 −1

Original line number	Diff line number	Diff line
		@@ -287,7 +287,11 @@ static inline struct list_head page_deferred_list(struct page page)
		#define HPAGE_PUD_MASK ({ BUILD_BUG(); 0; })
		#define HPAGE_PUD_SIZE ({ BUILD_BUG(); 0; })

		#define hpage_nr_pages(x) 1
		static inline int hpage_nr_pages(struct page *page)
		{
		VM_BUG_ON_PAGE(PageTail(page), page);
		return 1;
		}

		static inline bool __transparent_hugepage_enabled(struct vm_area_struct *vma)
		{

Admin message