diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2018-01-22 11:50:22 +0530 |
|---|---|---|
| committer | Amit Pundir <amit.pundir@linaro.org> | 2018-01-22 11:50:22 +0530 |
| commit | 395ae9f4e6934c9f61d7002dc12b267d0c302104 (patch) | |
| tree | d80d145feb56614796dfe6c2ce41db16b290daf3 /mm/vmstat.c | |
| parent | 317c5652a7c300c2d82ef5bfae8d3558f389d219 (diff) | |
| parent | 13b48cd3ac945d4e4075bec53f107a315fe771ae (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Conflicts:
kernel/fork.c
Conflict due to Kaiser implementation in LTS 4.4.110.
net/ipv4/raw.c
Minor conflict due to LTS commit
be27b620a861 ("net: ipv4: fix for a race condition in raw_sendmsg")
Diffstat (limited to 'mm/vmstat.c')
| -rw-r--r-- | mm/vmstat.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mm/vmstat.c b/mm/vmstat.c index 44618235722c..8640a185dfc6 100644 --- a/mm/vmstat.c +++ b/mm/vmstat.c @@ -738,6 +738,7 @@ const char * const vmstat_text[] = { "nr_slab_unreclaimable", "nr_page_table_pages", "nr_kernel_stack", + "nr_overhead", "nr_unstable", "nr_bounce", "nr_vmscan_write", @@ -1352,7 +1353,9 @@ static int vmstat_show(struct seq_file *m, void *arg) unsigned long *l = arg; unsigned long off = l - (unsigned long *)m->private; - seq_printf(m, "%s %lu\n", vmstat_text[off], *l); + seq_puts(m, vmstat_text[off]); + seq_put_decimal_ull(m, ' ', *l); + seq_putc(m, '\n'); return 0; } |