projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mem-hotplug: alloc new page from a nearest neighbor node when mem-offline
[deliverable/linux.git]
/
mm
/
util.c
diff --git
a/mm/util.c
b/mm/util.c
index 8d010ef2ce1c8e094919b85e95130fe82474bd5b..662cddf914af2048ab6c9c674f59d37a7aceba69 100644
(file)
--- 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);
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
/*
* 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.
*/
* 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();
free += get_nr_swap_pages();
This page took
0.032259 seconds
and
5
git commands to generate.