@@ -2071,10 +2071,11 @@ inline void post_alloc_hook(struct page *page, unsigned int order,
set_page_owner(page, order, gfp_flags);
}
-static void prep_new_page(struct page *page, unsigned int order, gfp_t gfp_flags,
- unsigned int alloc_flags)
+static void prep_new_page(struct page *page, gfp_t gfp_flags,
+ unsigned int alloc_flags)
{
int i;
+ unsigned int order = gfp_order(gfp_flags);
post_alloc_hook(page, order, gfp_flags);
@@ -3615,7 +3616,7 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags,
page = rmqueue(ac->preferred_zoneref->zone, zone, order,
gfp_mask, alloc_flags, ac->migratetype);
if (page) {
- prep_new_page(page, order, gfp_mask, alloc_flags);
+ prep_new_page(page, gfp_mask, alloc_flags);
/*
* If this is a high-order atomic allocation then check
@@ -3840,7 +3841,7 @@ __alloc_pages_direct_compact(gfp_t gfp_mask, unsigned int order,
/* Prep a captured page if available */
if (page)
- prep_new_page(page, order, gfp_mask, alloc_flags);
+ prep_new_page(page, gfp_mask, alloc_flags);
/* Try get a page from the freelist if available */
if (!page)