Merge tag 'x86-mm-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 mm cleanup from Thomas Gleixner:
 "Use PAGE_ALIGNED() instead of open coding it in the x86/mm code"

* tag 'x86-mm-2022-06-05' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Use PAGE_ALIGNED(x) instead of IS_ALIGNED(x, PAGE_SIZE)

diff --combined arch/x86/mm/init_64.c
index cb290a2f0747fb20ebcc86e7035bb6ca14d26277,8779d6be6a49bafdd6c0f8fb1126349a3634e04f..39c5246964a91592066fca256f5d7f590462ddbe
--- 1/arch/x86/mm/init_64.c
--- 2/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@@ -1240,8 -1240,8 +1240,8 @@@ remove_pagetable(unsigned long start, u
  void __ref vmemmap_free(unsigned long start, unsigned long end,
                struct vmem_altmap *altmap)
  {
-       VM_BUG_ON(!IS_ALIGNED(start, PAGE_SIZE));
-       VM_BUG_ON(!IS_ALIGNED(end, PAGE_SIZE));
+       VM_BUG_ON(!PAGE_ALIGNED(start));
+       VM_BUG_ON(!PAGE_ALIGNED(end));
  
        remove_pagetable(start, end, false, altmap);
  }
@@@ -1269,7 -1269,7 +1269,7 @@@ static struct kcore_list kcore_vsyscall
  
  static void __init register_page_bootmem_info(void)
  {
 -#if defined(CONFIG_NUMA) || defined(CONFIG_HUGETLB_PAGE_FREE_VMEMMAP)
 +#if defined(CONFIG_NUMA) || defined(CONFIG_HUGETLB_PAGE_OPTIMIZE_VMEMMAP)
        int i;
  
        for_each_online_node(i)
@@@ -1605,8 -1605,8 +1605,8 @@@ int __meminit vmemmap_populate(unsigne
  {
        int err;
  
-       VM_BUG_ON(!IS_ALIGNED(start, PAGE_SIZE));
-       VM_BUG_ON(!IS_ALIGNED(end, PAGE_SIZE));
+       VM_BUG_ON(!PAGE_ALIGNED(start));
+       VM_BUG_ON(!PAGE_ALIGNED(end));
  
        if (end - start < PAGES_PER_SECTION * sizeof(struct page))
                err = vmemmap_populate_basepages(start, end, node, NULL);