From ddbbceded6505559d36382ca53ca427bf7cf7c81 Mon Sep 17 00:00:00 2001 From: Gerald Schaefer Date: Mon, 22 Apr 2013 19:27:17 +0200 Subject: [PATCH] --- yaml --- r: 362813 b: refs/heads/master c: 186f50fa568a221fdabd6753341c2de4abd24b78 h: refs/heads/master i: 362811: e0bee98508b4ad3b1da0e6f07b0a3d864e20ab5b v: v3 --- [refs] | 2 +- trunk/arch/s390/pci/pci_dma.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d7e192d5580f..a82ac44d318c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 63dd9b44ac926d3250c1e8dfcb309c37c870fe21 +refs/heads/master: 186f50fa568a221fdabd6753341c2de4abd24b78 diff --git a/trunk/arch/s390/pci/pci_dma.c b/trunk/arch/s390/pci/pci_dma.c index 60e4999e6b67..f8e69d5bc0a9 100644 --- a/trunk/arch/s390/pci/pci_dma.c +++ b/trunk/arch/s390/pci/pci_dma.c @@ -269,8 +269,6 @@ static dma_addr_t s390_dma_map_pages(struct device *dev, struct page *page, int flags = ZPCI_PTE_VALID; dma_addr_t dma_addr; - WARN_ON_ONCE(offset > PAGE_SIZE); - /* This rounds up number of pages based on size and offset */ nr_pages = iommu_num_pages(pa, size, PAGE_SIZE); iommu_page_index = dma_alloc_iommu(zdev, nr_pages); @@ -292,7 +290,7 @@ static dma_addr_t s390_dma_map_pages(struct device *dev, struct page *page, if (!dma_update_trans(zdev, pa, dma_addr, size, flags)) { atomic64_add(nr_pages, (atomic64_t *) &zdev->fmb->mapped_pages); - return dma_addr + offset; + return dma_addr + (offset & ~PAGE_MASK); } out_free: