From 0a1f5dbf83be81af98d0121c5f11364a13c9d7d3 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Mon, 3 Dec 2012 16:11:34 +0100
Subject: [PATCH] --- yaml --- r: 343411 b: refs/heads/master c:
 4118fee78dabb138b548bd42694f3437a8830b60 h: refs/heads/master i:   343409:
 4fdeb0f3612b0ac7c4e06f4695b1ecc45aa8ac89   343407:
 40c477564d2baab38cf37173ecf8b5fc8e4e19c8 v: v3

---
 [refs]                    | 2 +-
 trunk/arch/s390/pci/pci.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b85f24ec7532..a16241e0ee68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 916908df244fe53cc81d560ebaa9e2d11f1cee43
+refs/heads/master: 4118fee78dabb138b548bd42694f3437a8830b60
diff --git a/trunk/arch/s390/pci/pci.c b/trunk/arch/s390/pci/pci.c
index 0723b1077a64..b0cef4db2413 100644
--- a/trunk/arch/s390/pci/pci.c
+++ b/trunk/arch/s390/pci/pci.c
@@ -602,10 +602,9 @@ struct zpci_dev *zpci_alloc_device(void)
 		return ERR_PTR(-ENOMEM);
 
 	/* Alloc aibv & callback space */
-	zdev->irq_map = kmem_cache_alloc(zdev_irq_cache, GFP_KERNEL);
+	zdev->irq_map = kmem_cache_zalloc(zdev_irq_cache, GFP_KERNEL);
 	if (!zdev->irq_map)
 		goto error;
-	memset(zdev->irq_map, 0, sizeof(*zdev->irq_map));
 	WARN_ON((u64) zdev->irq_map & 0xff);
 	return zdev;