aboutsummaryrefslogtreecommitdiffstats
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r--mm/page_alloc.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 0bea94af0423..a4562c058ec4 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4509,7 +4509,7 @@ long si_mem_available(void)
4509 * Estimate the amount of memory available for userspace allocations, 4509 * Estimate the amount of memory available for userspace allocations,
4510 * without causing swapping. 4510 * without causing swapping.
4511 */ 4511 */
4512 available = global_page_state(NR_FREE_PAGES) - totalreserve_pages; 4512 available = global_zone_page_state(NR_FREE_PAGES) - totalreserve_pages;
4513 4513
4514 /* 4514 /*
4515 * Not all the page cache can be freed, otherwise the system will 4515 * Not all the page cache can be freed, otherwise the system will
@@ -4538,7 +4538,7 @@ void si_meminfo(struct sysinfo *val)
4538{ 4538{
4539 val->totalram = totalram_pages; 4539 val->totalram = totalram_pages;
4540 val->sharedram = global_node_page_state(NR_SHMEM); 4540 val->sharedram = global_node_page_state(NR_SHMEM);
4541 val->freeram = global_page_state(NR_FREE_PAGES); 4541 val->freeram = global_zone_page_state(NR_FREE_PAGES);
4542 val->bufferram = nr_blockdev_pages(); 4542 val->bufferram = nr_blockdev_pages();
4543 val->totalhigh = totalhigh_pages; 4543 val->totalhigh = totalhigh_pages;
4544 val->freehigh = nr_free_highpages(); 4544 val->freehigh = nr_free_highpages();
@@ -4673,11 +4673,11 @@ void show_free_areas(unsigned int filter, nodemask_t *nodemask)
4673 global_node_page_state(NR_SLAB_UNRECLAIMABLE), 4673 global_node_page_state(NR_SLAB_UNRECLAIMABLE),
4674 global_node_page_state(NR_FILE_MAPPED), 4674 global_node_page_state(NR_FILE_MAPPED),
4675 global_node_page_state(NR_SHMEM), 4675 global_node_page_state(NR_SHMEM),
4676 global_page_state(NR_PAGETABLE), 4676 global_zone_page_state(NR_PAGETABLE),
4677 global_page_state(NR_BOUNCE), 4677 global_zone_page_state(NR_BOUNCE),
4678 global_page_state(NR_FREE_PAGES), 4678 global_zone_page_state(NR_FREE_PAGES),
4679 free_pcp, 4679 free_pcp,
4680 global_page_state(NR_FREE_CMA_PAGES)); 4680 global_zone_page_state(NR_FREE_CMA_PAGES));
4681 4681
4682 for_each_online_pgdat(pgdat) { 4682 for_each_online_pgdat(pgdat) {
4683 if (show_mem_node_skip(filter, pgdat->node_id, nodemask)) 4683 if (show_mem_node_skip(filter, pgdat->node_id, nodemask))