diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-23 12:10:12 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-23 12:10:12 +1000 |
| commit | 94000cc32988a0674923309d35ab9c2405c4b39b (patch) | |
| tree | ef9d58ea9ad614bfdf6d0c7c6293f05dbd989475 /arch/x86/mm/dump_pagetables.c | |
| parent | a5eb76d9c892b8bd7d3505f8897cf126a54860bd (diff) | |
| parent | 7089db84e356562f8ba737c29e472cc42d530dbc (diff) | |
Merge tag 'v4.10-rc8' into drm-next
Linux 4.10-rc8
Backmerge Linus rc8 to fix some conflicts, but also
to avoid pulling it in via a fixes pull from someone.
Diffstat (limited to 'arch/x86/mm/dump_pagetables.c')
| -rw-r--r-- | arch/x86/mm/dump_pagetables.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index ea9c49adaa1f..8aa6bea1cd6c 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -15,6 +15,7 @@ #include <linux/debugfs.h> #include <linux/mm.h> #include <linux/init.h> +#include <linux/sched.h> #include <linux/seq_file.h> #include <asm/pgtable.h> @@ -406,6 +407,7 @@ static void ptdump_walk_pgd_level_core(struct seq_file *m, pgd_t *pgd, } else note_page(m, &st, __pgprot(0), 1); + cond_resched(); start++; } |