From dd4ee3c10b5c1a076d18d2ae40d87fce1632677f Mon Sep 17 00:00:00 2001 From: Gavin Shan Date: Tue, 31 Jul 2012 16:42:49 -0700 Subject: [PATCH] --- yaml --- r: 320787 b: refs/heads/master c: c59e26104e3e0e952cd7d63e79cd71ee5a9ec25a h: refs/heads/master i: 320785: 78ac3f329233ba994f931097026ebd84cfb744cb 320783: d8e34a349db31ab6c18b1aa6541196b92765ff47 v: v3 --- [refs] | 2 +- trunk/include/linux/compaction.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 */