diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-11 11:55:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-11 11:55:56 +0100 |
| commit | e9b3bd248b349433215cf01064a866b632fb3f4b (patch) | |
| tree | 9821327345bdced3d895723cba1181d7ca399aca /mm/page_alloc.c | |
| parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
| parent | 80475b849b90d8bed1fe768c496280f4b5c11410 (diff) | |
Merge branch 'linaro-fixes/experimental/android-3.10' of git://git.linaro.org/people/jstultz/android into lsk-v3.10-jstultz
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index c3edb624fcc..58f55f605ad 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -197,6 +197,7 @@ static char * const zone_names[MAX_NR_ZONES] = { }; int min_free_kbytes = 1024; +int min_free_order_shift = 1; static unsigned long __meminitdata nr_kernel_pages; static unsigned long __meminitdata nr_all_pages; @@ -1648,7 +1649,7 @@ static bool __zone_watermark_ok(struct zone *z, int order, unsigned long mark, free_pages -= z->free_area[o].nr_free << o; /* Require fewer higher order pages to be free */ - min >>= 1; + min >>= min_free_order_shift; if (free_pages <= min) return false; |