diff options
| author | Konstantin Khlebnikov <khlebnikov@yandex-team.ru> | 2019-04-18 17:50:20 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-04-27 09:36:40 +0200 |
| commit | 1343fd8f9629ef1e040bdb84626ae69382272741 (patch) | |
| tree | fefa260aea2aae2d2b9b04b09a95c5e87f3b7100 | |
| parent | 628c99a836dde71a4e415859359b7ebecdb3d363 (diff) | |
| download | linux-stable-1343fd8f9629ef1e040bdb84626ae69382272741.tar.gz linux-stable-1343fd8f9629ef1e040bdb84626ae69382272741.tar.bz2 linux-stable-1343fd8f9629ef1e040bdb84626ae69382272741.zip | |
mm/vmstat.c: fix /proc/vmstat format for CONFIG_DEBUG_TLBFLUSH=y CONFIG_SMP=n
commit e8277b3b52240ec1caad8e6df278863e4bf42eac upstream.
Commit 58bc4c34d249 ("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly")
depends on skipping vmstat entries with empty name introduced in
7aaf77272358 ("mm: don't show nr_indirectly_reclaimable in
/proc/vmstat") but reverted in b29940c1abd7 ("mm: rename and change
semantics of nr_indirectly_reclaimable_bytes").
So skipping no longer works and /proc/vmstat has misformatted lines " 0".
This patch simply shows debug counters "nr_tlb_remote_*" for UP.
Link: http://lkml.kernel.org/r/155481488468.467.4295519102880913454.stgit@buzz
Fixes: 58bc4c34d249 ("mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly")
Signed-off-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Cc: Roman Gushchin <guro@fb.com>
Cc: Jann Horn <jannh@google.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | mm/vmstat.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/mm/vmstat.c b/mm/vmstat.c index 2878dc4e9af6..4a387937f9f5 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -1272,13 +1272,8 @@ const char * const vmstat_text[] = { #endif #endif /* CONFIG_MEMORY_BALLOON */ #ifdef CONFIG_DEBUG_TLBFLUSH -#ifdef CONFIG_SMP "nr_tlb_remote_flush", "nr_tlb_remote_flush_received", -#else - "", /* nr_tlb_remote_flush */ - "", /* nr_tlb_remote_flush_received */ -#endif /* CONFIG_SMP */ "nr_tlb_local_flush_all", "nr_tlb_local_flush_one", #endif /* CONFIG_DEBUG_TLBFLUSH */ |