diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-25 09:08:07 -1000 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-25 09:08:07 -1000 |
commit | 1e876e3b1a9df25bb04682b0d48aaa7e8ae1fc82 (patch) | |
tree | e5f77a7bf65cd4b2d564c2b6cec49b3770796f17 /arch/s390/include/asm/dma-mapping.h | |
parent | ad465470563152f8dcc61161148ff620efefb2a8 (diff) | |
parent | eda4ddf7e3a2245888e8c45c566fd514cdd5abbb (diff) | |
download | linux-3.10-1e876e3b1a9df25bb04682b0d48aaa7e8ae1fc82.tar.gz linux-3.10-1e876e3b1a9df25bb04682b0d48aaa7e8ae1fc82.tar.bz2 linux-3.10-1e876e3b1a9df25bb04682b0d48aaa7e8ae1fc82.zip |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull s390 fixes from Martin Schwidefsky:
"A couple of last-minute fixes: a build regression for !SMP, a recent
memory detection patch caused kdump to break, a regression in regard
to sscanf vs reboot from FCP, and two fixes in the DMA mapping code
for PCI"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390/ipl: Fix FCP WWPN and LUN format strings for read
s390/mem_detect: fix memory hole handling
s390/dma: support debug_dma_mapping_error
s390/dma: fix mapping_error detection
s390/irq: Only define synchronize_irq() on SMP
Diffstat (limited to 'arch/s390/include/asm/dma-mapping.h')
-rw-r--r-- | arch/s390/include/asm/dma-mapping.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/include/asm/dma-mapping.h b/arch/s390/include/asm/dma-mapping.h index 886ac7d4937..2f8c1abeb08 100644 --- a/arch/s390/include/asm/dma-mapping.h +++ b/arch/s390/include/asm/dma-mapping.h @@ -50,9 +50,10 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr) { struct dma_map_ops *dma_ops = get_dma_ops(dev); + debug_dma_mapping_error(dev, dma_addr); if (dma_ops->mapping_error) return dma_ops->mapping_error(dev, dma_addr); - return (dma_addr == 0UL); + return (dma_addr == DMA_ERROR_CODE); } static inline void *dma_alloc_coherent(struct device *dev, size_t size, |