diff --git a/[refs] b/[refs]
index 4c4bd4fdacb5..80e8175b44a4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc6e0c3b909157748ce1c0c0f2a9935a5ee3c812
+refs/heads/master: 21643e69a4c06f7ef155fbc70e3fba13fba4a756
diff --git a/trunk/drivers/xen/gntalloc.c b/trunk/drivers/xen/gntalloc.c
index f6832f46aea4..23c60cf4313e 100644
--- a/trunk/drivers/xen/gntalloc.c
+++ b/trunk/drivers/xen/gntalloc.c
@@ -280,7 +280,7 @@ static long gntalloc_ioctl_alloc(struct gntalloc_file_private_data *priv,
 		goto out;
 	}
 
-	gref_ids = kzalloc(sizeof(gref_ids[0]) * op.count, GFP_TEMPORARY);
+	gref_ids = kcalloc(op.count, sizeof(gref_ids[0]), GFP_TEMPORARY);
 	if (!gref_ids) {
 		rc = -ENOMEM;
 		goto out;