diff options
Diffstat (limited to 'mm/hugetlb.c')
| -rw-r--r-- | mm/hugetlb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 04306b9de90d..c01cb9fedb18 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c | |||
| @@ -584,7 +584,7 @@ static void update_and_free_page(struct hstate *h, struct page *page) | |||
| 584 | 1 << PG_active | 1 << PG_reserved | | 584 | 1 << PG_active | 1 << PG_reserved | |
| 585 | 1 << PG_private | 1 << PG_writeback); | 585 | 1 << PG_private | 1 << PG_writeback); |
| 586 | } | 586 | } |
| 587 | VM_BUG_ON(hugetlb_cgroup_from_page(page)); | 587 | VM_BUG_ON_PAGE(hugetlb_cgroup_from_page(page), page); |
| 588 | set_compound_page_dtor(page, NULL); | 588 | set_compound_page_dtor(page, NULL); |
| 589 | set_page_refcounted(page); | 589 | set_page_refcounted(page); |
| 590 | arch_release_hugepage(page); | 590 | arch_release_hugepage(page); |
| @@ -1089,7 +1089,7 @@ retry: | |||
| 1089 | * no users -- drop the buddy allocator's reference. | 1089 | * no users -- drop the buddy allocator's reference. |
| 1090 | */ | 1090 | */ |
| 1091 | put_page_testzero(page); | 1091 | put_page_testzero(page); |
| 1092 | VM_BUG_ON(page_count(page)); | 1092 | VM_BUG_ON_PAGE(page_count(page), page); |
| 1093 | enqueue_huge_page(h, page); | 1093 | enqueue_huge_page(h, page); |
| 1094 | } | 1094 | } |
| 1095 | free: | 1095 | free: |
| @@ -3503,7 +3503,7 @@ int dequeue_hwpoisoned_huge_page(struct page *hpage) | |||
| 3503 | 3503 | ||
| 3504 | bool isolate_huge_page(struct page *page, struct list_head *list) | 3504 | bool isolate_huge_page(struct page *page, struct list_head *list) |
| 3505 | { | 3505 | { |
| 3506 | VM_BUG_ON(!PageHead(page)); | 3506 | VM_BUG_ON_PAGE(!PageHead(page), page); |
| 3507 | if (!get_page_unless_zero(page)) | 3507 | if (!get_page_unless_zero(page)) |
| 3508 | return false; | 3508 | return false; |
| 3509 | spin_lock(&hugetlb_lock); | 3509 | spin_lock(&hugetlb_lock); |
| @@ -3514,7 +3514,7 @@ bool isolate_huge_page(struct page *page, struct list_head *list) | |||
| 3514 | 3514 | ||
| 3515 | void putback_active_hugepage(struct page *page) | 3515 | void putback_active_hugepage(struct page *page) |
| 3516 | { | 3516 | { |
| 3517 | VM_BUG_ON(!PageHead(page)); | 3517 | VM_BUG_ON_PAGE(!PageHead(page), page); |
| 3518 | spin_lock(&hugetlb_lock); | 3518 | spin_lock(&hugetlb_lock); |
| 3519 | list_move_tail(&page->lru, &(page_hstate(page))->hugepage_activelist); | 3519 | list_move_tail(&page->lru, &(page_hstate(page))->hugepage_activelist); |
| 3520 | spin_unlock(&hugetlb_lock); | 3520 | spin_unlock(&hugetlb_lock); |
| @@ -3523,7 +3523,7 @@ void putback_active_hugepage(struct page *page) | |||
| 3523 | 3523 | ||
| 3524 | bool is_hugepage_active(struct page *page) | 3524 | bool is_hugepage_active(struct page *page) |
| 3525 | { | 3525 | { |
| 3526 | VM_BUG_ON(!PageHuge(page)); | 3526 | VM_BUG_ON_PAGE(!PageHuge(page), page); |
| 3527 | /* | 3527 | /* |
| 3528 | * This function can be called for a tail page because the caller, | 3528 | * This function can be called for a tail page because the caller, |
| 3529 | * scan_movable_pages, scans through a given pfn-range which typically | 3529 | * scan_movable_pages, scans through a given pfn-range which typically |
