summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2011-02-27 06:21:57 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2011-02-27 06:21:57 +0100
commit59e6ff20398879907f29a298dee3c59d4dd46d93 (patch)
treedb6c237e4eccfe9d9d5c6f2a0ae38e9c7f1be0f7
parentda58914d63a59a6859e503192656ffd6302b353c (diff)
parent09e30dadef0f942c2a522606ff768e9be943e59b (diff)
Merge branch 'upstream-merged'
-rw-r--r--procfs/rootdir.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/procfs/rootdir.c b/procfs/rootdir.c
index 15ef8bce..1fa71b03 100644
--- a/procfs/rootdir.c
+++ b/procfs/rootdir.c
@@ -283,15 +283,18 @@ rootdir_gc_meminfo (void *hook, char **contents, ssize_t *contents_len)
*contents_len = asprintf (contents,
"MemTotal: %14lu kB\n"
"MemFree: %14lu kB\n"
+ "Buffers: %14lu kB\n"
+ "Cached: %14lu kB\n"
"Active: %14lu kB\n"
"Inactive: %14lu kB\n"
"Mlocked: %14lu kB\n"
"SwapTotal:%14lu kB\n"
"SwapFree: %14lu kB\n"
,
- /* TODO: check that these are really 1024-bytes kBs. */
(long unsigned) hbi.memory_size / 1024,
(long unsigned) vmstats.free_count * PAGE_SIZE / 1024,
+ 0,
+ 0,
(long unsigned) vmstats.active_count * PAGE_SIZE / 1024,
(long unsigned) vmstats.inactive_count * PAGE_SIZE / 1024,
(long unsigned) vmstats.wire_count * PAGE_SIZE / 1024,