aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc/meminfo.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/proc/meminfo.c')
-rw-r--r--fs/proc/meminfo.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
index d5c410d47fae..78faedcb0a8d 100644
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
@@ -95,7 +95,11 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
95 "Committed_AS: %8lu kB\n" 95 "Committed_AS: %8lu kB\n"
96 "VmallocTotal: %8lu kB\n" 96 "VmallocTotal: %8lu kB\n"
97 "VmallocUsed: %8lu kB\n" 97 "VmallocUsed: %8lu kB\n"
98 "VmallocChunk: %8lu kB\n", 98 "VmallocChunk: %8lu kB\n"
99#ifdef CONFIG_MEMORY_FAILURE
100 "HardwareCorrupted: %8lu kB\n"
101#endif
102 ,
99 K(i.totalram), 103 K(i.totalram),
100 K(i.freeram), 104 K(i.freeram),
101 K(i.bufferram), 105 K(i.bufferram),
@@ -140,6 +144,9 @@ static int meminfo_proc_show(struct seq_file *m, void *v)
140 (unsigned long)VMALLOC_TOTAL >> 10, 144 (unsigned long)VMALLOC_TOTAL >> 10,
141 vmi.used >> 10, 145 vmi.used >> 10,
142 vmi.largest_chunk >> 10 146 vmi.largest_chunk >> 10
147#ifdef CONFIG_MEMORY_FAILURE
148 ,atomic_long_read(&mce_bad_pages) << (PAGE_SHIFT - 10)
149#endif
143 ); 150 );
144 151
145 hugetlb_report_meminfo(m); 152 hugetlb_report_meminfo(m);