From 1d675fac602f2cc0202de6ec759727d72dc88849 Mon Sep 17 00:00:00 2001
From: Mel Gorman <mel@csn.ul.ie>
Date: Tue, 16 Jun 2009 15:31:52 -0700
Subject: [PATCH] --- yaml --- r: 151524 b: refs/heads/master c:
 d239171e4f6efd58d7e423853056b1b6a74f1446 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/include/linux/gfp.h | 12 ++----------
 trunk/mm/page_alloc.c     |  4 ++--
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 4f536fd472ff..9b3558dfebc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6c0db4664b49417d80988953e69c323721353227
+refs/heads/master: d239171e4f6efd58d7e423853056b1b6a74f1446
diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h
index 3760e7c5de02..549ec5583103 100644
--- a/trunk/include/linux/gfp.h
+++ b/trunk/include/linux/gfp.h
@@ -172,24 +172,16 @@ static inline void arch_alloc_page(struct page *page, int order) { }
 #endif
 
 struct page *
-__alloc_pages_internal(gfp_t gfp_mask, unsigned int order,
+__alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
 		       struct zonelist *zonelist, nodemask_t *nodemask);
 
 static inline struct page *
 __alloc_pages(gfp_t gfp_mask, unsigned int order,
 		struct zonelist *zonelist)
 {
-	return __alloc_pages_internal(gfp_mask, order, zonelist, NULL);
+	return __alloc_pages_nodemask(gfp_mask, order, zonelist, NULL);
 }
 
-static inline struct page *
-__alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
-		struct zonelist *zonelist, nodemask_t *nodemask)
-{
-	return __alloc_pages_internal(gfp_mask, order, zonelist, nodemask);
-}
-
-
 static inline struct page *alloc_pages_node(int nid, gfp_t gfp_mask,
 						unsigned int order)
 {
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index cbed869fd831..d58df9031503 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -1458,7 +1458,7 @@ get_page_from_freelist(gfp_t gfp_mask, nodemask_t *nodemask, unsigned int order,
  * This is the 'heart' of the zoned buddy allocator.
  */
 struct page *
-__alloc_pages_internal(gfp_t gfp_mask, unsigned int order,
+__alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,
 			struct zonelist *zonelist, nodemask_t *nodemask)
 {
 	const gfp_t wait = gfp_mask & __GFP_WAIT;
@@ -1667,7 +1667,7 @@ __alloc_pages_internal(gfp_t gfp_mask, unsigned int order,
 got_pg:
 	return page;
 }
-EXPORT_SYMBOL(__alloc_pages_internal);
+EXPORT_SYMBOL(__alloc_pages_nodemask);
 
 /*
  * Common helper functions.