On Wed, May 28 2014, Joonsoo Kim <iamjoonsoo....@lge.com> wrote:
> @@ -1143,10 +1223,15 @@ __rmqueue_fallback(struct zone *zone, int order, int 
> start_migratetype)
>  static struct page *__rmqueue(struct zone *zone, unsigned int order,
>                                               int migratetype)
>  {
> -     struct page *page;
> +     struct page *page = NULL;
> +
> +     if (IS_ENABLED(CONFIG_CMA) &&
> +             migratetype == MIGRATE_MOVABLE && zone->managed_cma_pages)
> +             page = __rmqueue_cma(zone, order);

Come to think of it, I would consider:

        if (…) {
                page = __rmqueue_cma(zone, order);
                if (page)
                        goto done
        }

        …

done:
        trace_mm_page_alloc_zone_locked(page, order, migratetype);
        return page;

>  
>  retry_reserve:
> -     page = __rmqueue_smallest(zone, order, migratetype);
> +     if (!page)
> +             page = __rmqueue_smallest(zone, order, migratetype);
>  

The above would allow this if statement to go away.

>       if (unlikely(!page) && migratetype != MIGRATE_RESERVE) {
>               page = __rmqueue_fallback(zone, order, migratetype);

-- 
Best regards,                                         _     _
.o. | Liege of Serenely Enlightened Majesty of      o' \,=./ `o
..o | Computer Science,  Michał “mina86” Nazarewicz    (o o)
ooo +--<m...@google.com>--<xmpp:min...@jabber.org>--ooO--(_)--Ooo--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to