| Message ID | 20210830141051.64090-2-linmiaohe@huawei.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Cleanups and fixup for page_alloc | expand |
On Mon, Aug 30, 2021 at 10:10:46PM +0800, Miaohe Lin wrote: > It's meaningless to VM_BUG_ON() order != pageblock_order just after > setting order to pageblock_order. Remove it. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Acked-by: Mel Gorman <mgorman@techsingularity.net>
On 30.08.21 16:10, Miaohe Lin wrote: > It's meaningless to VM_BUG_ON() order != pageblock_order just after > setting order to pageblock_order. Remove it. > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> > --- > mm/page_alloc.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 91edb930b8ab..dbb3338d9287 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -677,10 +677,8 @@ static inline int pindex_to_order(unsigned int pindex) > int order = pindex / MIGRATE_PCPTYPES; > > #ifdef CONFIG_TRANSPARENT_HUGEPAGE > - if (order > PAGE_ALLOC_COSTLY_ORDER) { > + if (order > PAGE_ALLOC_COSTLY_ORDER) > order = pageblock_order; > - VM_BUG_ON(order != pageblock_order); > - } > #else > VM_BUG_ON(order > PAGE_ALLOC_COSTLY_ORDER); > #endif > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 91edb930b8ab..dbb3338d9287 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -677,10 +677,8 @@ static inline int pindex_to_order(unsigned int pindex) int order = pindex / MIGRATE_PCPTYPES; #ifdef CONFIG_TRANSPARENT_HUGEPAGE - if (order > PAGE_ALLOC_COSTLY_ORDER) { + if (order > PAGE_ALLOC_COSTLY_ORDER) order = pageblock_order; - VM_BUG_ON(order != pageblock_order); - } #else VM_BUG_ON(order > PAGE_ALLOC_COSTLY_ORDER); #endif
It's meaningless to VM_BUG_ON() order != pageblock_order just after setting order to pageblock_order. Remove it. Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> --- mm/page_alloc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)