X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=mm%2Futil.c;h=662cddf914af2048ab6c9c674f59d37a7aceba69;hb=394e31d2ceb4b9eae25bd9ed8ea8cb19a40ff181;hp=8d010ef2ce1c8e094919b85e95130fe82474bd5b;hpb=c79a14defb3d8344802115e1b2a62d201354dc18;p=deliverable%2Flinux.git diff --git a/mm/util.c b/mm/util.c index 8d010ef2ce1c..662cddf914af 100644 --- a/mm/util.c +++ b/mm/util.c @@ -528,7 +528,7 @@ int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin) if (sysctl_overcommit_memory == OVERCOMMIT_GUESS) { free = global_page_state(NR_FREE_PAGES); - free += global_page_state(NR_FILE_PAGES); + free += global_node_page_state(NR_FILE_PAGES); /* * shmem pages shouldn't be counted as free in this @@ -536,7 +536,7 @@ int __vm_enough_memory(struct mm_struct *mm, long pages, int cap_sys_admin) * that won't affect the overall amount of available * memory in the system. */ - free -= global_page_state(NR_SHMEM); + free -= global_node_page_state(NR_SHMEM); free += get_nr_swap_pages();