diff options
Diffstat (limited to 'fs/proc/meminfo.c')
-rw-r--r-- | fs/proc/meminfo.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c index 40f108783d59..c1fdcc1a907a 100644 --- a/fs/proc/meminfo.c +++ b/fs/proc/meminfo.c | |||
@@ -40,7 +40,7 @@ static int meminfo_proc_show(struct seq_file *m, void *v) | |||
40 | si_swapinfo(&i); | 40 | si_swapinfo(&i); |
41 | committed = percpu_counter_read_positive(&vm_committed_as); | 41 | committed = percpu_counter_read_positive(&vm_committed_as); |
42 | 42 | ||
43 | cached = global_page_state(NR_FILE_PAGES) - | 43 | cached = global_node_page_state(NR_FILE_PAGES) - |
44 | total_swapcache_pages() - i.bufferram; | 44 | total_swapcache_pages() - i.bufferram; |
45 | if (cached < 0) | 45 | if (cached < 0) |
46 | cached = 0; | 46 | cached = 0; |
@@ -138,8 +138,8 @@ static int meminfo_proc_show(struct seq_file *m, void *v) | |||
138 | #endif | 138 | #endif |
139 | K(i.totalswap), | 139 | K(i.totalswap), |
140 | K(i.freeswap), | 140 | K(i.freeswap), |
141 | K(global_page_state(NR_FILE_DIRTY)), | 141 | K(global_node_page_state(NR_FILE_DIRTY)), |
142 | K(global_page_state(NR_WRITEBACK)), | 142 | K(global_node_page_state(NR_WRITEBACK)), |
143 | K(global_node_page_state(NR_ANON_MAPPED)), | 143 | K(global_node_page_state(NR_ANON_MAPPED)), |
144 | K(global_node_page_state(NR_FILE_MAPPED)), | 144 | K(global_node_page_state(NR_FILE_MAPPED)), |
145 | K(i.sharedram), | 145 | K(i.sharedram), |
@@ -152,9 +152,9 @@ static int meminfo_proc_show(struct seq_file *m, void *v) | |||
152 | #ifdef CONFIG_QUICKLIST | 152 | #ifdef CONFIG_QUICKLIST |
153 | K(quicklist_total_size()), | 153 | K(quicklist_total_size()), |
154 | #endif | 154 | #endif |
155 | K(global_page_state(NR_UNSTABLE_NFS)), | 155 | K(global_node_page_state(NR_UNSTABLE_NFS)), |
156 | K(global_page_state(NR_BOUNCE)), | 156 | K(global_page_state(NR_BOUNCE)), |
157 | K(global_page_state(NR_WRITEBACK_TEMP)), | 157 | K(global_node_page_state(NR_WRITEBACK_TEMP)), |
158 | K(vm_commit_limit()), | 158 | K(vm_commit_limit()), |
159 | K(committed), | 159 | K(committed), |
160 | (unsigned long)VMALLOC_TOTAL >> 10, | 160 | (unsigned long)VMALLOC_TOTAL >> 10, |
@@ -164,9 +164,9 @@ static int meminfo_proc_show(struct seq_file *m, void *v) | |||
164 | , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10) | 164 | , atomic_long_read(&num_poisoned_pages) << (PAGE_SHIFT - 10) |
165 | #endif | 165 | #endif |
166 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE | 166 | #ifdef CONFIG_TRANSPARENT_HUGEPAGE |
167 | , K(global_page_state(NR_ANON_THPS) * HPAGE_PMD_NR) | 167 | , K(global_node_page_state(NR_ANON_THPS) * HPAGE_PMD_NR) |
168 | , K(global_page_state(NR_SHMEM_THPS) * HPAGE_PMD_NR) | 168 | , K(global_node_page_state(NR_SHMEM_THPS) * HPAGE_PMD_NR) |
169 | , K(global_page_state(NR_SHMEM_PMDMAPPED) * HPAGE_PMD_NR) | 169 | , K(global_node_page_state(NR_SHMEM_PMDMAPPED) * HPAGE_PMD_NR) |
170 | #endif | 170 | #endif |
171 | #ifdef CONFIG_CMA | 171 | #ifdef CONFIG_CMA |
172 | , K(totalcma_pages) | 172 | , K(totalcma_pages) |