aboutsummaryrefslogtreecommitdiffstats
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r--mm/page_alloc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index fd8e3ca0cf3b..8485735fc690 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -421,7 +421,7 @@ static inline int page_is_buddy(struct page *page, struct page *buddy,
421 return 0; 421 return 0;
422 422
423 if (PageBuddy(buddy) && page_order(buddy) == order) { 423 if (PageBuddy(buddy) && page_order(buddy) == order) {
424 BUG_ON(page_count(buddy) != 0); 424 VM_BUG_ON(page_count(buddy) != 0);
425 return 1; 425 return 1;
426 } 426 }
427 return 0; 427 return 0;
@@ -497,7 +497,7 @@ static inline int free_pages_check(struct page *page)
497{ 497{
498 if (unlikely(page_mapcount(page) | 498 if (unlikely(page_mapcount(page) |
499 (page->mapping != NULL) | 499 (page->mapping != NULL) |
500 (page_count(page) != 0) | 500 (atomic_read(&page->_count) != 0) |
501 (page->flags & PAGE_FLAGS_CHECK_AT_FREE))) { 501 (page->flags & PAGE_FLAGS_CHECK_AT_FREE))) {
502 bad_page(page); 502 bad_page(page);
503 return 1; 503 return 1;
@@ -642,7 +642,7 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags)
642{ 642{
643 if (unlikely(page_mapcount(page) | 643 if (unlikely(page_mapcount(page) |
644 (page->mapping != NULL) | 644 (page->mapping != NULL) |
645 (page_count(page) != 0) | 645 (atomic_read(&page->_count) != 0) |
646 (page->flags & PAGE_FLAGS_CHECK_AT_PREP))) { 646 (page->flags & PAGE_FLAGS_CHECK_AT_PREP))) {
647 bad_page(page); 647 bad_page(page);
648 return 1; 648 return 1;