Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 509cb37e authored by Heiko Carstens's avatar Heiko Carstens Committed by Linus Torvalds
Browse files

[PATCH] one more iomap s390 build fix 



Commit 9ac7849e causes this on S390:

  drivers/built-in.o: In function `dmam_noncoherent_release':
    dma-mapping.c:(.text+0x1515c): undefined reference to `dma_free_noncoherent'
  drivers/built-in.o: In function `dmam_free_noncoherent':
    undefined reference to `dma_free_noncoherent'
  drivers/built-in.o: In function `dmam_alloc_noncoherent':
    undefined reference to `dma_alloc_noncoherent'
  make: *** [.tmp_vmlinux1] Error 1

Cc: Tejun Heo <htejun@gmail.com>
Acked-by: default avatarJeff Garzik <jeff@garzik.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9ede209e

include/asm-generic/dma-mapping-broken.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,6 @@ 




/* This is used for archs that do not support DMA */

/* This is used for archs that do not support DMA */







static inline void *

static inline void *

dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,

dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,

		   gfp_t flag)

		   gfp_t flag)
@@ -19,4 +18,7 @@ dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, 
	BUG();

	BUG();

}

}





#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f)

#define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)



#endif /* _ASM_GENERIC_DMA_MAPPING_H */
 
#endif /* _ASM_GENERIC_DMA_MAPPING_H */