aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/page_cgroup.c3
-rw-r--r--mm/vmscan.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c
index 39d216d535ea..6bdc67dbbc28 100644
--- a/mm/page_cgroup.c
+++ b/mm/page_cgroup.c
@@ -513,11 +513,10 @@ int swap_cgroup_swapon(int type, unsigned long max_pages)
513 length = DIV_ROUND_UP(max_pages, SC_PER_PAGE); 513 length = DIV_ROUND_UP(max_pages, SC_PER_PAGE);
514 array_size = length * sizeof(void *); 514 array_size = length * sizeof(void *);
515 515
516 array = vmalloc(array_size); 516 array = vzalloc(array_size);
517 if (!array) 517 if (!array)
518 goto nomem; 518 goto nomem;
519 519
520 memset(array, 0, array_size);
521 ctrl = &swap_cgroup_ctrl[type]; 520 ctrl = &swap_cgroup_ctrl[type];
522 mutex_lock(&swap_cgroup_mutex); 521 mutex_lock(&swap_cgroup_mutex);
523 ctrl->length = length; 522 ctrl->length = length;
diff --git a/mm/vmscan.c b/mm/vmscan.c
index b55699cd9067..9fdfce7ba403 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -1416,7 +1416,7 @@ static inline bool should_reclaim_stall(unsigned long nr_taken,
1416 if (sc->reclaim_mode & RECLAIM_MODE_SINGLE) 1416 if (sc->reclaim_mode & RECLAIM_MODE_SINGLE)
1417 return false; 1417 return false;
1418 1418
1419 /* If we have relaimed everything on the isolated list, no stall */ 1419 /* If we have reclaimed everything on the isolated list, no stall */
1420 if (nr_freed == nr_taken) 1420 if (nr_freed == nr_taken)
1421 return false; 1421 return false;
1422 1422