---

yaml --- r: 320787 b: refs/heads/master c: c59e261 h: refs/heads/master i: 320785: 78ac3f3 320783: d8e34a3 v: v3
git-mirror · Aug 1, 2012 · dd4ee3c · dd4ee3c
1 parent adb6097
commit dd4ee3c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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 */