diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-18 20:01:17 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-12-18 20:01:17 +1100 |
| commit | 703b190c713a0f6156ae77a439277a8803af7228 (patch) | |
| tree | 7df1729c93a7348717cdf85a3e859b26f1097b00 /fs/proc/meminfo.c | |
| parent | 5d6c57b9566de3c67ad8af5e344ee5aa0a705908 (diff) | |
| parent | d10f9907ba3626261f45dbb498867f441f06c486 (diff) | |
Merge commit 'nommu/master'
Conflicts:
Documentation/sysctl/vm.txt
kernel/fork.c
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)), |