From 21798e1396c401e935a672d5b0787b9f031b6a79 Mon Sep 17 00:00:00 2001 From: fef Date: Mon, 22 Nov 2021 20:05:49 +0100 Subject: [PATCH] mm/page: remove the stupid --- kernel/mm/page.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/mm/page.c b/kernel/mm/page.c index de44c32..7e6c01a 100644 --- a/kernel/mm/page.c +++ b/kernel/mm/page.c @@ -372,7 +372,7 @@ static __always_inline bool can_merge(vm_page_t page, vm_page_t buddy) /* we know that `page' is not reserved, because we * check that flag before we even attempt coalition */ const unsigned mask = _PGA_RSVD_MASK | _PGA_ZONE_MASK; - merge &= (atom_read(&page->attr) & mask) == (atom_read(&page->attr) & mask); + merge &= (atom_read(&page->attr) & mask) == (atom_read(&buddy->attr) & mask); return merge; } @@ -398,13 +398,13 @@ void free_pages(void *ptr) init_pages(ptr, PAGE_POISON_FREE, order); #endif - int old_count = atom_sub(&page->count, 1); PAGE_DEBUG_BLOCK { + int old_count = atom_sub(&page->count, 1); if (old_count != 1) { if (old_count == 0) - page_debug("double free of page %p", ptr); + page_debug("double free of %p", ptr); else - page_debug("attempted to free page %p with references", ptr); + page_debug("attempted to free %p with references", ptr); return; } }