Commit 0b7da15c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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)
parents 9784edd7 e19d1126

arch/x86/mm/init_64.c

+4 −4
Original line number Diff line number Diff line
@@ -1240,8 +1240,8 @@ remove_pagetable(unsigned long start, unsigned long end, bool direct, 
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);

}
@@ -1605,8 +1605,8 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, 
{

	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);