aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/gfp.h12
-rw-r--r--mm/page_alloc.c4
2 files changed, 4 insertions, 12 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 3760e7c5de02..549ec5583103 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -172,24 +172,16 @@ static inline void arch_alloc_page(struct page *page, int order) { }
172#endif 172#endif
173 173
174struct page * 174struct page *
175__alloc_pages_internal(gfp_t gfp_mask, unsigned int order, 175__alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
176 struct zonelist *zonelist, nodemask_t *nodemask); 176 struct zonelist *zonelist, nodemask_t *nodemask);
177 177
178static inline struct page * 178static inline struct page *
179__alloc_pages(gfp_t gfp_mask, unsigned int order, 179__alloc_pages(gfp_t gfp_mask, unsigned int order,
180 struct zonelist *zonelist) 180 struct zonelist *zonelist)
181{ 181{
182 return __alloc_pages_internal(gfp_mask, order, zonelist, NULL); 182 return __alloc_pages_nodemask(gfp_mask, order, zonelist, NULL);
183} 183}
184 184
185static inline struct page *
186__alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
187 struct zonelist *zonelist, nodemask_t *nodemask)
188{
189 return __alloc_pages_internal(gfp_mask, order, zonelist, nodemask);
190}
191
192
193static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask, 185static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask,
194 unsigned int order) 186 unsigned int order)
195{ 187{
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index cbed869fd831..d58df9031503 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -1458,7 +1458,7 @@ try_next_zone:
1458 * This is the 'heart' of the zoned buddy allocator. 1458 * This is the 'heart' of the zoned buddy allocator.
1459 */ 1459 */
1460struct page * 1460struct page *
1461__alloc_pages_internal(gfp_t gfp_mask, unsigned int order, 1461__alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
1462 struct zonelist *zonelist, nodemask_t *nodemask) 1462 struct zonelist *zonelist, nodemask_t *nodemask)
1463{ 1463{
1464 const gfp_t wait = gfp_mask & __GFP_WAIT; 1464 const gfp_t wait = gfp_mask & __GFP_WAIT;
@@ -1667,7 +1667,7 @@ nopage:
1667got_pg: 1667got_pg:
1668 return page; 1668 return page;
1669} 1669}
1670EXPORT_SYMBOL(__alloc_pages_internal); 1670EXPORT_SYMBOL(__alloc_pages_nodemask);
1671 1671
1672/* 1672/*
1673 * Common helper functions. 1673 * Common helper functions.