Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756198Ab1E1Rh0 (ORCPT ); Sat, 28 May 2011 13:37:26 -0400 Received: from mail.perches.com ([173.55.12.10]:2246 "EHLO mail.perches.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754860Ab1E1RhY (ORCPT ); Sat, 28 May 2011 13:37:24 -0400 From: Joe Perches To: Balbir Singh , Daisuke Nishimura , KAMEZAWA Hiroyuki , Paul Menage , Li Zefan , Jiri Kosina Cc: linux-mm@kvack.org, containers@lists.linux-foundation.org, linux-kernel@vger.kernel.org Subject: [TRIVIAL PATCH next 14/15] mm: Convert vmalloc/memset to vzalloc Date: Sat, 28 May 2011 10:36:34 -0700 Message-Id: X-Mailer: git-send-email 1.7.5.rc3.dirty In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 909 Lines: 30 Signed-off-by: Joe Perches --- mm/page_cgroup.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c index 74ccff6..dbb28fd 100644 --- a/mm/page_cgroup.c +++ b/mm/page_cgroup.c @@ -478,11 +478,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; -- 1.7.5.rc3.dirty -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/