diff --git a/[refs] b/[refs]
index b64d89fa8ba1..634ea775c51a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c935d189be9bb877c5a1110ac5fbf9c8e310658
+refs/heads/master: c59e26104e3e0e952cd7d63e79cd71ee5a9ec25a
diff --git a/trunk/include/linux/compaction.h b/trunk/include/linux/compaction.h
index 51a90b7f2d60..133ddcf83397 100644
--- a/trunk/include/linux/compaction.h
+++ b/trunk/include/linux/compaction.h
@@ -58,7 +58,7 @@ static inline bool compaction_deferred(struct zone *zone, int order)
 	if (++zone->compact_considered > defer_limit)
 		zone->compact_considered = defer_limit;
 
-	return zone->compact_considered < (1UL << zone->compact_defer_shift);
+	return zone->compact_considered < defer_limit;
 }
 
 #else
@@ -85,7 +85,7 @@ static inline void defer_compaction(struct zone *zone, int order)
 
 static inline bool compaction_deferred(struct zone *zone, int order)
 {
-	return 1;
+	return true;
 }
 
 #endif /* CONFIG_COMPACTION */