Commit dd0c17c6 authored by Michal Hocko's avatar Michal Hocko Committed by Jason Liu

mm: fix off-by-two in __zone_watermark_ok()

Commit 88f5acf8 ("mm: page allocator: adjust the per-cpu counter
threshold when memory is low") changed the form how free_pages is
calculated but it forgot that we used to do free_pages - ((1 << order) -
1) so we ended up with off-by-two when calculating free_pages.
Reported-by: 's avatarWang Sheng-Hui <shhuiw@gmail.com>
Signed-off-by: 's avatarMichal Hocko <mhocko@suse.cz>
Acked-by: 's avatarMel Gorman <mgorman@suse.de>
Signed-off-by: 's avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: 's avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f7df0060
......@@ -1474,7 +1474,7 @@ static bool __zone_watermark_ok(struct zone *z, int order, unsigned long mark,
long min = mark;
int o;
free_pages -= (1 << order) + 1;
free_pages -= (1 << order) - 1;
if (alloc_flags & ALLOC_HIGH)
min -= min / 2;
if (alloc_flags & ALLOC_HARDER)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment