diff options
| author |   Sean Paul <seanpaul@chromium.org> | 2017-08-18 10:52:44 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-08-18 10:52:44 -0400 |
| commit | 0e8841ec7ee5b1ffe416c3be7743985b1896ec00 (patch) | |
| tree | 9e502f1f39c740ff7417e5078cbda6eedac1c572 /mm/debug.c | |
| parent | drm: udl: constify usb_device_id (diff) | |
| parent | Merge tag 'omapdrm-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next (diff) | |
| download | wireguard-linux-0e8841ec7ee5b1ffe416c3be7743985b1896ec00.tar.xz wireguard-linux-0e8841ec7ee5b1ffe416c3be7743985b1896ec00.zip | |
Merge airlied/drm-next into drm-misc-next
Archit requested this backmerge to facilitate merging some patches
depending on changes between -rc2 & -rc5
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Diffstat (limited to 'mm/debug.c')
| -rw-r--r-- | mm/debug.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/mm/debug.c b/mm/debug.c index db1cd26d8752..5715448ab0b5 100644 --- a/mm/debug.c +++ b/mm/debug.c @@ -124,9 +124,7 @@ void dump_mm(const struct mm_struct *mm) #ifdef CONFIG_NUMA_BALANCING "numa_next_scan %lu numa_scan_offset %lu numa_scan_seq %d\n" #endif -#if defined(CONFIG_NUMA_BALANCING) || defined(CONFIG_COMPACTION) "tlb_flush_pending %d\n" -#endif "def_flags: %#lx(%pGv)\n", mm, mm->mmap, mm->vmacache_seqnum, mm->task_size, @@ -158,9 +156,7 @@ void dump_mm(const struct mm_struct *mm) #ifdef CONFIG_NUMA_BALANCING mm->numa_next_scan, mm->numa_scan_offset, mm->numa_scan_seq, #endif -#if defined(CONFIG_NUMA_BALANCING) || defined(CONFIG_COMPACTION) - mm->tlb_flush_pending, -#endif + atomic_read(&mm->tlb_flush_pending), mm->def_flags, &mm->def_flags ); } |