From 81d66c70b546e7be5d7e1f1ca9676fd17c5973af Mon Sep 17 00:00:00 2001 From: "Justin P. Mattock" Date: Tue, 23 Aug 2011 09:28:02 -0700 Subject: mm/vmscan.c: fix a typo in a comment "relaimed" to "reclaimed" Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina --- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mm') diff --git a/mm/vmscan.c b/mm/vmscan.c index febbc044e792..8e32698fab66 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -1417,7 +1417,7 @@ static inline bool should_reclaim_stall(unsigned long nr_taken, if (sc->reclaim_mode & RECLAIM_MODE_SINGLE) return false; - /* If we have relaimed everything on the isolated list, no stall */ + /* If we have reclaimed everything on the isolated list, no stall */ if (nr_freed == nr_taken) return false; -- cgit v1.2.3-70-g09d2 From 8c1fec1ba83b7ce20b65a492a6e73e8d524aed88 Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Sat, 28 May 2011 10:36:34 -0700 Subject: mm: Convert vmalloc/memset to vzalloc Signed-off-by: Joe Perches Acked-by: Paul Menage Signed-off-by: Jiri Kosina --- mm/page_cgroup.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mm') 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) length = DIV_ROUND_UP(max_pages, SC_PER_PAGE); array_size = length * sizeof(void *); - array = vmalloc(array_size); + array = vzalloc(array_size); if (!array) goto nomem; - memset(array, 0, array_size); ctrl = &swap_cgroup_ctrl[type]; mutex_lock(&swap_cgroup_mutex); ctrl->length = length; -- cgit v1.2.3-70-g09d2