diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-03-19 08:57:07 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-03-19 08:57:07 +0800 |
| commit | 42f45c9abdea541a9f966553b5e71dd576d432f9 (patch) | |
| tree | e9189f804b03d19696b0944a5a34ea9427177646 /mm/compaction.c | |
| parent | 4d8fd56f051e5eea61209de4a3cb0619283a30af (diff) | |
| parent | ba0bfedf4c9cad58f56a7038d1462ffc21cd33df (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidlsk-v3.10-15.03-android
Diffstat (limited to 'mm/compaction.c')
| -rw-r--r-- | mm/compaction.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/compaction.c b/mm/compaction.c index fb797a32362f..eeaaa929d1de 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -881,7 +881,7 @@ static int compact_finished(struct zone *zone, return COMPACT_PARTIAL; /* Job done if allocation would set block type */ - if (cc->order >= pageblock_order && area->nr_free) + if (order >= pageblock_order && area->nr_free) return COMPACT_PARTIAL; } |