diff --git a/[refs] b/[refs] index d2519a70dcc5..37d7f7279510 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 728ec980fb9fa2d65d9e05444079a53615985e7b +refs/heads/master: 0a15c3e9f649f71464ac39e6378f1fde6f995322 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index 04713f649fd4..c101921e6a64 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -1072,7 +1072,8 @@ void split_page(struct page *page, unsigned int order) * we cheat by calling it from here, in the order > 0 path. Saves a branch * or two. */ -static struct page *buffered_rmqueue(struct zone *preferred_zone, +static inline +struct page *buffered_rmqueue(struct zone *preferred_zone, struct zone *zone, int order, gfp_t gfp_flags, int migratetype) {