diff options
| author | Takashi Iwai <tiwai@suse.de> | 2017-12-27 09:02:02 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2017-12-27 09:02:02 +0100 |
| commit | 7ad3423ebb02f340671f70a916bdc8dbec7573ee (patch) | |
| tree | b9168d363c24f2af2626e63011ec1f6c81e81d09 /mm/kmemleak.c | |
| parent | 56a23ee52611ca76421f3d7cac100e1616716dae (diff) | |
| parent | 44be77c590f381bc629815ac789b8b15ecc4ddcf (diff) | |
| download | talos-op-linux-7ad3423ebb02f340671f70a916bdc8dbec7573ee.tar.gz talos-op-linux-7ad3423ebb02f340671f70a916bdc8dbec7573ee.zip | |
Merge branch 'for-linus' into for-next
Back-merge the upstream branch for applying further cleanup patches
for HD-Audio.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'mm/kmemleak.c')
| -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 e4738d5e9b8c..d73c14294f3a 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -1523,6 +1523,8 @@ static void kmemleak_scan(void) if (page_count(page) == 0) continue; scan_block(page, page + 1, NULL); + if (!(pfn & 63)) + cond_resched(); } } put_online_mems(); |
