diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-31 14:20:06 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-31 14:20:06 +0200 |
| commit | 3e83dfd5d8e374328078f527f1f7d189824896ab (patch) | |
| tree | 2f82b2e82f7a4b5c513fed42d4228a8bce938180 /mm/debug.c | |
| parent | 3308376a914b9c3f57a12072c063814403d983a8 (diff) | |
| parent | 9e52fc2b50de3a1c08b44f94c610fbe998c0031a (diff) | |
| download | talos-op-linux-3e83dfd5d8e374328078f527f1f7d189824896ab.tar.gz talos-op-linux-3e83dfd5d8e374328078f527f1f7d189824896ab.zip | |
Merge branch 'x86/mm' into x86/platform, to pick up TLB flush dependency
Signed-off-by: Ingo Molnar <mingo@kernel.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 ); } |
