X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=kernel%2Fgroups.c;h=787b381c7c0026c31793ab1ebd0c2383ced820f0;hb=c815f04ba94940fbc303a6ea9669e7da87f8e77d;hp=fe7e6385530e679596009b2e125cb808397d870f;hpb=2da4c187aea31b870bf11c9e4d00581002002216;p=linux-2.6-microblaze.git

diff --git a/kernel/groups.c b/kernel/groups.c
index fe7e6385530e..787b381c7c00 100644
--- a/kernel/groups.c
+++ b/kernel/groups.c
@@ -15,12 +15,7 @@
 struct group_info *groups_alloc(int gidsetsize)
 {
 	struct group_info *gi;
-	unsigned int len;
-
-	len = sizeof(struct group_info) + sizeof(kgid_t) * gidsetsize;
-	gi = kmalloc(len, GFP_KERNEL_ACCOUNT|__GFP_NOWARN|__GFP_NORETRY);
-	if (!gi)
-		gi = __vmalloc(len, GFP_KERNEL_ACCOUNT);
+	gi = kvmalloc(struct_size(gi, gid, gidsetsize), GFP_KERNEL_ACCOUNT);
 	if (!gi)
 		return NULL;