diff --git a/[refs] b/[refs] index 2eb9738785c8..4d9cd6bcff7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7602bdf2fd14a40dd9b104e516fdc05e1bd17952 +refs/heads/master: cc102509074bba0316f2b5deebd7ef4447da295e diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h index bf2b6bc3f6fd..00c314aedab7 100644 --- a/trunk/include/linux/gfp.h +++ b/trunk/include/linux/gfp.h @@ -116,6 +116,9 @@ static inline enum zone_type gfp_zone(gfp_t flags) #ifndef HAVE_ARCH_FREE_PAGE static inline void arch_free_page(struct page *page, int order) { } #endif +#ifndef HAVE_ARCH_ALLOC_PAGE +static inline void arch_alloc_page(struct page *page, int order) { } +#endif extern struct page * FASTCALL(__alloc_pages(gfp_t, unsigned int, struct zonelist *)); diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 230771d3c6b6..cd47e8f7bd5b 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -598,6 +598,8 @@ static int prep_new_page(struct page *page, int order, gfp_t gfp_flags) 1 << PG_checked | 1 << PG_mappedtodisk); set_page_private(page, 0); set_page_refcounted(page); + + arch_alloc_page(page, order); kernel_map_pages(page, 1 << order, 1); if (gfp_flags & __GFP_ZERO)