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

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
...@@ -1240,8 +1240,8 @@ remove_pagetable(unsigned long start, unsigned long end, bool direct, ...@@ -1240,8 +1240,8 @@ remove_pagetable(unsigned long start, unsigned long end, bool direct,
void __ref vmemmap_free(unsigned long start, unsigned long end, void __ref vmemmap_free(unsigned long start, unsigned long end,
struct vmem_altmap *altmap) struct vmem_altmap *altmap)
{ {
VM_BUG_ON(!IS_ALIGNED(start, PAGE_SIZE)); VM_BUG_ON(!PAGE_ALIGNED(start));
VM_BUG_ON(!IS_ALIGNED(end, PAGE_SIZE)); VM_BUG_ON(!PAGE_ALIGNED(end));
remove_pagetable(start, end, false, altmap); remove_pagetable(start, end, false, altmap);
} }
...@@ -1605,8 +1605,8 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node, ...@@ -1605,8 +1605,8 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node,
{ {
int err; int err;
VM_BUG_ON(!IS_ALIGNED(start, PAGE_SIZE)); VM_BUG_ON(!PAGE_ALIGNED(start));
VM_BUG_ON(!IS_ALIGNED(end, PAGE_SIZE)); VM_BUG_ON(!PAGE_ALIGNED(end));
if (end - start < PAGES_PER_SECTION * sizeof(struct page)) if (end - start < PAGES_PER_SECTION * sizeof(struct page))
err = vmemmap_populate_basepages(start, end, node, NULL); err = vmemmap_populate_basepages(start, end, node, NULL);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment