From 722401ada0ed8988c34bc1c4565c3b0f9f6a829f Mon Sep 17 00:00:00 2001
From: Jan Glauber <jang@linux.vnet.ibm.com>
Date: Thu, 6 Dec 2012 14:30:28 +0100
Subject: [PATCH] --- yaml --- r: 343415 b: refs/heads/master c:
 87bc359b9822a73f264f24f3c1b3e4e7e5ed7d72 h: refs/heads/master i:   343413:
 eaf452c093c4710bab7b5f3806a837e3df657903   343411:
 0a1f5dbf83be81af98d0121c5f11364a13c9d7d3   343407:
 40c477564d2baab38cf37173ecf8b5fc8e4e19c8 v: v3

---
 [refs]                    | 2 +-
 trunk/arch/s390/pci/pci.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bd62e73463c6..90dd1a78f560 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9163003236a52fd1a8ee6ca8a04f7232d001fc98
+refs/heads/master: 87bc359b9822a73f264f24f3c1b3e4e7e5ed7d72
diff --git a/trunk/arch/s390/pci/pci.c b/trunk/arch/s390/pci/pci.c
index b0cef4db2413..bc8935d3e5da 100644
--- a/trunk/arch/s390/pci/pci.c
+++ b/trunk/arch/s390/pci/pci.c
@@ -355,6 +355,12 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res,
 	return 0;
 }
 
+/* combine single writes by using store-block insn */
+void __iowrite64_copy(void __iomem *to, const void *from, size_t count)
+{
+       zpci_memcpy_toio(to, from, count);
+}
+
 /* Create a virtual mapping cookie for a PCI BAR */
 void __iomem *pci_iomap(struct pci_dev *pdev, int bar, unsigned long max)
 {