From abcb2fee4310abf4494f23a039d02c7fd6038091 Mon Sep 17 00:00:00 2001
From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Mon, 31 Oct 2011 17:09:08 -0700
Subject: [PATCH] --- yaml --- r: 272154 b: refs/heads/master c:
 d43a87e68e9e71d2987a29cc239acec4e8f410c9 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/compaction.h | 8 --------
 trunk/mm/compaction.c            | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 5975158dfb7e..4da8873ef7c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd73e85f6d8f721d66bcbd2734a5f4bc3d3cd768
+refs/heads/master: d43a87e68e9e71d2987a29cc239acec4e8f410c9
diff --git a/trunk/include/linux/compaction.h b/trunk/include/linux/compaction.h
index cc9f7a428649..bb2bbdbe5464 100644
--- a/trunk/include/linux/compaction.h
+++ b/trunk/include/linux/compaction.h
@@ -24,8 +24,6 @@ extern unsigned long try_to_compact_pages(struct zonelist *zonelist,
 			int order, gfp_t gfp_mask, nodemask_t *mask,
 			bool sync);
 extern unsigned long compaction_suitable(struct zone *zone, int order);
-extern unsigned long compact_zone_order(struct zone *zone, int order,
-					gfp_t gfp_mask, bool sync);
 
 /* Do not skip compaction more than 64 times */
 #define COMPACT_MAX_DEFER_SHIFT 6
@@ -69,12 +67,6 @@ static inline unsigned long compaction_suitable(struct zone *zone, int order)
 	return COMPACT_SKIPPED;
 }
 
-static inline unsigned long compact_zone_order(struct zone *zone, int order,
-					       gfp_t gfp_mask, bool sync)
-{
-	return COMPACT_CONTINUE;
-}
-
 static inline void defer_compaction(struct zone *zone)
 {
 }
diff --git a/trunk/mm/compaction.c b/trunk/mm/compaction.c
index a0e420207ebf..899d95638586 100644
--- a/trunk/mm/compaction.c
+++ b/trunk/mm/compaction.c
@@ -582,7 +582,7 @@ static int compact_zone(struct zone *zone, struct compact_control *cc)
 	return ret;
 }
 
-unsigned long compact_zone_order(struct zone *zone,
+static unsigned long compact_zone_order(struct zone *zone,
 				 int order, gfp_t gfp_mask,
 				 bool sync)
 {