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;