Revert "UPSTREAM: mm: page_alloc: fix up block types when merging compatible blocks"
This reverts commit 4792c30baf
.
Change-Id: I9cabe83a8dad03358d13a05016456435e8cbc72d
Bug: 420771453
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
This commit is contained in:
@@ -912,17 +912,10 @@ static inline void __free_one_page(struct page *page,
|
||||
*/
|
||||
int buddy_mt = get_pfnblock_migratetype(buddy, buddy_pfn);
|
||||
|
||||
if (migratetype != buddy_mt) {
|
||||
if (!migratetype_is_mergeable(migratetype) ||
|
||||
!migratetype_is_mergeable(buddy_mt))
|
||||
goto done_merging;
|
||||
/*
|
||||
* Match buddy type. This ensures that
|
||||
* an expand() down the line puts the
|
||||
* sub-blocks on the right freelists.
|
||||
*/
|
||||
set_pageblock_migratetype(buddy, migratetype);
|
||||
}
|
||||
if (migratetype != buddy_mt
|
||||
&& (!migratetype_is_mergeable(migratetype) ||
|
||||
!migratetype_is_mergeable(buddy_mt)))
|
||||
goto done_merging;
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user