aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2016-01-09 02:16:04 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2016-01-09 02:16:04 -0500
commitbdb97e91e0140230bda9a83f6dbaa29b0c2e0522 (patch)
tree2b4d0308c54241f520a811fec089719a76e3f961
parent263a3df18fa2c078ab3e8b14fece6cfa6053e86a (diff)
[s390] page_to_phys() always returns a multiple of PAGE_SIZE
Acked-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--arch/s390/pci/pci_dma.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c
index d348f2c09a1e..32da0a6ecec2 100644
--- a/arch/s390/pci/pci_dma.c
+++ b/arch/s390/pci/pci_dma.c
@@ -366,8 +366,7 @@ static void *s390_dma_alloc(struct device *dev, size_t size,
366 pa = page_to_phys(page); 366 pa = page_to_phys(page);
367 memset((void *) pa, 0, size); 367 memset((void *) pa, 0, size);
368 368
369 map = s390_dma_map_pages(dev, page, pa % PAGE_SIZE, 369 map = s390_dma_map_pages(dev, page, 0, size, DMA_BIDIRECTIONAL, NULL);
370 size, DMA_BIDIRECTIONAL, NULL);
371 if (dma_mapping_error(dev, map)) { 370 if (dma_mapping_error(dev, map)) {
372 free_pages(pa, get_order(size)); 371 free_pages(pa, get_order(size));
373 return NULL; 372 return NULL;