diff options
author | Alex Shi <alex.shi@linaro.org> | 2018-02-13 12:04:22 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2018-02-13 12:04:22 +0800 |
commit | c27f79b8d14797d8908d27b2e532e9e91291166e (patch) | |
tree | eb30c0184de79369f9695f14c2d3c08636a14fe4 /mm | |
parent | 9cebd248bd83dea5ead3f1ab5f3cbaf241588e37 (diff) | |
parent | 331b057d4f3ccf2290e6e651b5728db81e9249c6 (diff) |
Merge tag 'v4.9.80' into linux-linaro-lsk-v4.9
This is the 4.9.80 stable release
Diffstat (limited to 'mm')
-rw-r--r-- | mm/kmemleak.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mm/kmemleak.c b/mm/kmemleak.c index d1380ed93fdf..20cf3be9a5e8 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -1442,6 +1442,8 @@ static void kmemleak_scan(void) if (page_count(page) == 0) continue; scan_block(page, page + 1, NULL); + if (!(pfn % (MAX_SCAN_SIZE / sizeof(*page)))) + cond_resched(); } } put_online_mems(); |