These are some generic cleanups and improvements, which I would like merged into mmotm soon. The first one should be a performance improvement for all users of compound pages, and the others are aimed at getting code to compile away when CONFIG_TRANSPARENT_HUGEPAGE is disabled (ie small systems). Also better documented / less confusing than the current prefix mixture of compound, hpage and thp. Matthew Wilcox (Oracle) (7): mm: Store compound_nr as well as compound_order mm: Move page-flags include to top of file mm: Add thp_order mm: Add thp_size mm: Replace hpage_nr_pages with thp_nr_pages mm: Add thp_head mm: Introduce offset_in_thp drivers/nvdimm/btt.c | 4 +-- drivers/nvdimm/pmem.c | 6 ++-- include/linux/huge_mm.h | 58 ++++++++++++++++++++++++++++++++++++--- include/linux/mm.h | 12 ++++---- include/linux/mm_inline.h | 6 ++-- include/linux/mm_types.h | 1 + include/linux/pagemap.h | 6 ++-- mm/compaction.c | 2 +- mm/filemap.c | 2 +- mm/gup.c | 2 +- mm/hugetlb.c | 2 +- mm/internal.h | 4 +-- mm/memcontrol.c | 10 +++---- mm/memory_hotplug.c | 7 ++--- mm/mempolicy.c | 2 +- mm/migrate.c | 16 +++++------ mm/mlock.c | 9 +++--- mm/page_alloc.c | 5 ++-- mm/page_io.c | 4 +-- mm/page_vma_mapped.c | 6 ++-- mm/rmap.c | 8 +++--- mm/swap.c | 16 +++++------ mm/swap_state.c | 6 ++-- mm/swapfile.c | 2 +- mm/vmscan.c | 6 ++-- mm/workingset.c | 6 ++-- 26 files changed, 127 insertions(+), 81 deletions(-) -- 2.27.0