diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-17 23:45:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-17 23:45:02 +0100 |
| commit | 6e9c6e87a662c6665053fc3cc7840ed6fa80414e (patch) | |
| tree | 2c573ee6bd9e9d77b35ec956e3dfe8aca0ae6fa6 /mm/vmstat.c | |
| parent | Staging: comedi: kcomedilib: replace deprecated simple_strtoul() with kstrtou... (diff) | |
| parent | Linux 3.14-rc3 (diff) | |
| download | linux-6e9c6e87a662c6665053fc3cc7840ed6fa80414e.tar.xz linux-6e9c6e87a662c6665053fc3cc7840ed6fa80414e.zip | |
Merge 3.14-rc3 into staging-next
We want the fixes in this branch to make testing and future work easier.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/vmstat.c')
| -rw-r--r-- | mm/vmstat.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mm/vmstat.c b/mm/vmstat.c index 72496140ac08..def5dd2fbe61 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -851,12 +851,14 @@ const char * const vmstat_text[] = { "thp_zero_page_alloc", "thp_zero_page_alloc_failed", #endif +#ifdef CONFIG_DEBUG_TLBFLUSH #ifdef CONFIG_SMP "nr_tlb_remote_flush", "nr_tlb_remote_flush_received", -#endif +#endif /* CONFIG_SMP */ "nr_tlb_local_flush_all", "nr_tlb_local_flush_one", +#endif /* CONFIG_DEBUG_TLBFLUSH */ #endif /* CONFIG_VM_EVENTS_COUNTERS */ }; |