diff --git a/[refs] b/[refs] index 37d7f7279510..dd8efad55633 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a15c3e9f649f71464ac39e6378f1fde6f995322 +refs/heads/master: 0ac3a4099b0171ff965836182bc688bb8ca01058 diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c index c101921e6a64..91e29b3ed2b6 100644 --- a/trunk/mm/page_alloc.c +++ b/trunk/mm/page_alloc.c @@ -771,8 +771,8 @@ static int move_freepages_block(struct zone *zone, struct page *page, } /* Remove an element from the buddy allocator from the fallback list */ -static struct page *__rmqueue_fallback(struct zone *zone, int order, - int start_migratetype) +static inline struct page * +__rmqueue_fallback(struct zone *zone, int order, int start_migratetype) { struct free_area * area; int current_order;