From 71d96b48191f64b8f9f35343dfd9479114956a7c Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Mon, 25 Feb 2013 22:09:25 +0800
Subject: [PATCH] --- yaml --- r: 362767 b: refs/heads/master c:
 08b421245692f3d10f010f02dae69df6a305271c h: refs/heads/master i:   362765:
 12e5471303acff29977251e069eb3ccabc60f7dc   362763:
 119d696508f80986012289d8354d6f5bafdf4fee   362759:
 5ef7b67fd0d26056ebccaff4b0c6fb0f2486b09c   362751:
 9fc882b22e43edbf3a3109eb66bb7cae7d7aa466 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 2c27ef782c6a..aadef03e6060 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7919e91b34316ee30b14334389e005eb2e9b8e39
+refs/heads/master: 08b421245692f3d10f010f02dae69df6a305271c
diff --git a/trunk/arch/s390/pci/pci.c b/trunk/arch/s390/pci/pci.c
index 27b4c17855b9..fddf847e71ac 100644
--- a/trunk/arch/s390/pci/pci.c
+++ b/trunk/arch/s390/pci/pci.c
@@ -249,10 +249,9 @@ int zpci_fmb_enable_device(struct zpci_dev *zdev)
 	if (zdev->fmb)
 		return -EINVAL;
 
-	zdev->fmb = kmem_cache_alloc(zdev_fmb_cache, GFP_KERNEL);
+	zdev->fmb = kmem_cache_zalloc(zdev_fmb_cache, GFP_KERNEL);
 	if (!zdev->fmb)
 		return -ENOMEM;
-	memset(zdev->fmb, 0, sizeof(*zdev->fmb));
 	WARN_ON((u64) zdev->fmb & 0xf);
 
 	args.fmb_addr = virt_to_phys(zdev->fmb);