diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-02-27 06:21:33 +0100 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-02-27 06:21:33 +0100 |
commit | 09e30dadef0f942c2a522606ff768e9be943e59b (patch) | |
tree | 43ea0782429c7c09e3e70662f44c1181aaddd147 | |
parent | f531540f8b26f53357c144ab3f954699335f5a6b (diff) | |
parent | 5eccffafe9baa64ba9572860f540acd3aa023fd1 (diff) |
Merge branch 'procfs-jkoenig-moved' into upstream-merged
-rw-r--r-- | procfs/rootdir.c | 5 |
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, |