diff options
| author | Ingo Molnar <[email protected]> | 2009-01-11 02:41:39 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2009-01-11 02:41:39 +0000 |
| commit | abede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch) | |
| tree | 26c893ec108d837eb9171d678c55a1cea7b22af4 /fs/proc/meminfo.c | |
| parent | rcu: fix bug in rcutorture system-shutdown code (diff) | |
| parent | Linux 2.6.29-rc1 (diff) | |
| download | kernel-abede81c4fb2e3b85d8760f25e3da39d2c69a134.tar.gz kernel-abede81c4fb2e3b85d8760f25e3da39d2c69a134.zip | |
Merge commit 'v2.6.29-rc1' into core/urgent
Diffstat (limited to 'fs/proc/meminfo.c')
| -rw-r--r-- | fs/proc/meminfo.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index b1675c4e66da..43d23948384a 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c @@ -74,6 +74,9 @@ static int meminfo_proc_show(struct seq_file *m, void *v) "LowTotal: %8lu kB\n" "LowFree: %8lu kB\n" #endif +#ifndef CONFIG_MMU + "MmapCopy: %8lu kB\n" +#endif "SwapTotal: %8lu kB\n" "SwapFree: %8lu kB\n" "Dirty: %8lu kB\n" @@ -116,6 +119,9 @@ static int meminfo_proc_show(struct seq_file *m, void *v) K(i.totalram-i.totalhigh), K(i.freeram-i.freehigh), #endif +#ifndef CONFIG_MMU + K((unsigned long) atomic_read(&mmap_pages_allocated)), +#endif K(i.totalswap), K(i.freeswap), K(global_page_state(NR_FILE_DIRTY)), |