diff options
| author | Lee Jones <lee.jones@linaro.org> | 2011-07-26 17:31:06 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2011-07-26 17:35:08 +0100 |
| commit | 6f914cb1efe4aba81bb841ec8f4f5636163c0586 (patch) | |
| tree | 7ef04a88618a05c53faa2fd4ccd03e90c06a89bd /mm/page_alloc.c | |
| parent | 232bdfad970ce35177ca12c5527d1c96f7ce44f1 (diff) | |
Apply mega patch to make GLK the ALK
Signed-off-by: Lee Jones <lee.jones@linaro.org>
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 4e8985acdab..fef8dc3b11a 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -176,6 +176,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; @@ -1487,7 +1488,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; |