diff options
| author |   Sean Paul <seanpaul@chromium.org> | 2017-08-14 13:14:36 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-08-14 13:14:36 -0400 |
| commit | 1724c7c0c9494dcbdd7f630f29e1e8427cb231d1 (patch) | |
| tree | d7c7ad032289cdf0633feee4bd6ec5800b666ca7 /mm/debug.c | |
| parent | drm/atomic: Handle -EDEADLK with out-fences correctly (diff) | |
| parent | Linux 4.13-rc5 (diff) | |
| download | wireguard-linux-1724c7c0c9494dcbdd7f630f29e1e8427cb231d1.tar.xz wireguard-linux-1724c7c0c9494dcbdd7f630f29e1e8427cb231d1.zip | |
Merge origin/master into drm-misc-fixes
Backmerge 4.13-rc5 into drm-misc-fixes, it was getting a
little stale.
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 ); } |