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) {