diff options
| author | Colin Cross <ccross@android.com> | 2011-08-10 18:04:30 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-08-10 18:04:30 -0700 |
| commit | 4e111751cfcb75f26d2725eab934b6eb91a3d115 (patch) | |
| tree | b3d63b5b44bd2036db6e0f0b2e81769c84cc5ca3 /mm | |
| parent | ca64b0cd3a12d7704f4e98f4f5d51f41eb5047a2 (diff) | |
| parent | 02f8c6aee8df3cdc935e9bdd4f2d020306035dbe (diff) | |
Merge commit 'v3.0' into android-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 5ed24b94c5e6..d036e59d302b 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? */ |