diff options
| author | Matthew Wilcox (Oracle) <willy@infradead.org> | 2020-10-15 20:10:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-10-16 11:11:19 -0700 |
| commit | ab130f9108dcf2062a44f9f0706824ef2e30492e (patch) | |
| tree | 07e3283496e2772048141c882b1ef633364dec0f /mm/page_isolation.c | |
| parent | 1f0f8c0de09066d23760c1f5fac2cd53b32f1127 (diff) | |
| download | linux-stable-ab130f9108dcf2062a44f9f0706824ef2e30492e.tar.gz linux-stable-ab130f9108dcf2062a44f9f0706824ef2e30492e.tar.bz2 linux-stable-ab130f9108dcf2062a44f9f0706824ef2e30492e.zip | |
mm: rename page_order() to buddy_order()
The current page_order() can only be called on pages in the buddy
allocator. For compound pages, you have to use compound_order(). This is
confusing and led to a bug, so rename page_order() to buddy_order().
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Link: https://lkml.kernel.org/r/20201001152259.14932-2-willy@infradead.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_isolation.c')
| -rw-r--r-- | mm/page_isolation.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 83692b937784..abbf42214485 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -88,7 +88,7 @@ static void unset_migratetype_isolate(struct page *page, unsigned migratetype) * these pages to be merged. */ if (PageBuddy(page)) { - order = page_order(page); + order = buddy_order(page); if (order >= pageblock_order) { pfn = page_to_pfn(page); buddy_pfn = __find_buddy_pfn(pfn, order); @@ -261,7 +261,7 @@ __test_page_isolated_in_pageblock(unsigned long pfn, unsigned long end_pfn, * the correct MIGRATE_ISOLATE freelist. There is no * simple way to verify that as VM_BUG_ON(), though. */ - pfn += 1 << page_order(page); + pfn += 1 << buddy_order(page); else if ((flags & MEMORY_OFFLINE) && PageHWPoison(page)) /* A HWPoisoned page cannot be also PageBuddy */ pfn++; |