From: "Matthew Wilcox (Oracle)" <willy@xxxxxxxxxxxxx> These three patches add three helpers and convert the appropriate places to use them. v2: - Add page_shift() and compound_nr() - Remove unsigned long cast from PAGE_SIZE as it is already unsigned long - Update to current Linus tree Matthew Wilcox (Oracle) (3): mm: Introduce page_size() mm: Introduce page_shift() mm: Introduce compound_nr() arch/arm/include/asm/xen/page-coherent.h | 3 +-- arch/arm/mm/flush.c | 7 +++---- arch/arm64/include/asm/xen/page-coherent.h | 3 +-- arch/arm64/mm/flush.c | 3 +-- arch/ia64/mm/init.c | 2 +- arch/powerpc/mm/book3s64/iommu_api.c | 7 ++----- arch/powerpc/mm/hugetlbpage.c | 2 +- drivers/crypto/chelsio/chtls/chtls_io.c | 5 ++--- drivers/staging/android/ion/ion_system_heap.c | 4 ++-- drivers/target/tcm_fc/tfc_io.c | 3 +-- drivers/vfio/vfio_iommu_spapr_tce.c | 2 +- fs/io_uring.c | 2 +- fs/proc/task_mmu.c | 2 +- include/linux/hugetlb.h | 2 +- include/linux/mm.h | 18 ++++++++++++++++++ lib/iov_iter.c | 2 +- mm/compaction.c | 2 +- mm/filemap.c | 2 +- mm/gup.c | 2 +- mm/hugetlb_cgroup.c | 2 +- mm/kasan/common.c | 10 ++++------ mm/memcontrol.c | 4 ++-- mm/memory_hotplug.c | 4 ++-- mm/migrate.c | 2 +- mm/nommu.c | 2 +- mm/page_alloc.c | 2 +- mm/page_vma_mapped.c | 3 +-- mm/rmap.c | 9 +++------ mm/shmem.c | 8 ++++---- mm/slob.c | 2 +- mm/slub.c | 18 +++++++++--------- mm/swap_state.c | 2 +- mm/util.c | 2 +- mm/vmscan.c | 4 ++-- net/xdp/xsk.c | 2 +- 35 files changed, 76 insertions(+), 73 deletions(-) -- 2.20.1