diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-21 22:44:33 -0400 |
---|---|---|
committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-21 22:44:33 -0400 |
commit | db9431f0e697b132a7b6aca9c946f85851af5a39 (patch) | |
tree | 0aae6e53244c57c2c2a649c7dfa22f5f8c378739 /mm | |
parent | f25718e8cff17b5c64ad11c2a6e9d2ee1b676eef (diff) | |
parent | 57a6fa9acd6b4a479a6ede4d6d2258f04afd3a6f (diff) |
Merge remote-tracking branch 'linus' into linaro-3.0
Diffstat (limited to 'mm')
-rw-r--r-- | mm/vmscan.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mm/vmscan.c b/mm/vmscan.c index 5ed24b94c5e..d036e59d302 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2310,7 +2310,8 @@ static bool pgdat_balanced(pg_data_t *pgdat, unsigned long balanced_pages, for (i = 0; i <= classzone_idx; i++) present_pages += pgdat->node_zones[i].present_pages; - return balanced_pages > (present_pages >> 2); + /* A special case here: if zone has no page, we think it's balanced */ + return balanced_pages >= (present_pages >> 2); } /* is kswapd sleeping prematurely? */ |