forked from mirrors/linux
		
	mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly
5dd0b16cda("mm/vmstat: Make NR_TLB_REMOTE_FLUSH_RECEIVED available even on UP") made the availability of the NR_TLB_REMOTE_FLUSH* counters inside the kernel unconditional to reduce #ifdef soup, but (either to avoid showing dummy zero counters to userspace, or because that code was missed) didn't update the vmstat_array, meaning that all following counters would be shown with incorrect values. This only affects kernel builds with CONFIG_VM_EVENT_COUNTERS=y && CONFIG_DEBUG_TLBFLUSH=y && CONFIG_SMP=n. Link: http://lkml.kernel.org/r/20181001143138.95119-2-jannh@google.com Fixes:5dd0b16cda("mm/vmstat: Make NR_TLB_REMOTE_FLUSH_RECEIVED available even on UP") Signed-off-by: Jann Horn <jannh@google.com> Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Acked-by: Michal Hocko <mhocko@suse.com> Acked-by: Roman Gushchin <guro@fb.com> Cc: Davidlohr Bueso <dave@stgolabs.net> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Christoph Lameter <clameter@sgi.com> Cc: Kemi Wang <kemi.wang@intel.com> Cc: Andy Lutomirski <luto@kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
		
							parent
							
								
									28e2c4bb99
								
							
						
					
					
						commit
						58bc4c34d2
					
				
					 1 changed files with 3 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -1275,6 +1275,9 @@ const char * const vmstat_text[] = {
 | 
			
		|||
#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",
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in a new issue