From 8c72105a1d519b787ab4b38c543b3c56c2930b9c Mon Sep 17 00:00:00 2001
From: Thomas Meyer <thomas@m3y3r.de>
Date: Tue, 29 Nov 2011 22:08:00 +0100
Subject: [PATCH] --- yaml --- r: 285135 b: refs/heads/master c:
 f094148a1751d6ece9374851eb2926bc3cfd16ef h: refs/heads/master i:   285133:
 dc69c968bfd4df5d97a908815feaac77c54e5e09   285131:
 fc709ddd1304e45d6606591b98ed91479083d2c5   285127:
 4781f3e46d273371a354071000575410f4df3204   285119:
 a467fa92f0aad123bd97422f5fc16f79cbf51e3a v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/block/xen-blkfront.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 044413a9bd17..5f1a5c0764b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae18be11b5ccc3be9e268592616488c5f9d987f5
+refs/heads/master: f094148a1751d6ece9374851eb2926bc3cfd16ef
diff --git a/trunk/drivers/block/xen-blkfront.c b/trunk/drivers/block/xen-blkfront.c
index 351ddeffd430..8cb0c27f2654 100644
--- a/trunk/drivers/block/xen-blkfront.c
+++ b/trunk/drivers/block/xen-blkfront.c
@@ -157,7 +157,7 @@ static int xlbd_reserve_minors(unsigned int minor, unsigned int nr)
 	if (end > nr_minors) {
 		unsigned long *bitmap, *old;
 
-		bitmap = kzalloc(BITS_TO_LONGS(end) * sizeof(*bitmap),
+		bitmap = kcalloc(BITS_TO_LONGS(end), sizeof(*bitmap),
 				 GFP_KERNEL);
 		if (bitmap == NULL)
 			return -ENOMEM;