Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=509cb37e173d4e39cec47238397e91b718730794
Commit: 509cb37e173d4e39cec47238397e91b718730794
Parent: 9ede209e83693cf3f6b64f61ab4b65f2f809cb50
Author: Heiko Carstens <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 12 00:08:03 2007 +0100
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Sun Feb 11 20:06:39 2007 -0800
[PATCH] one more iomap s390 build fix
Commit 9ac7849e35f705830f7b016ff272b0ff1f7ff759 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 <[EMAIL PROTECTED]>
Acked-by: Jeff Garzik <[EMAIL PROTECTED]>
Cc: Martin Schwidefsky <[EMAIL PROTECTED]>
Signed-off-by: Heiko Carstens <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
include/asm-generic/dma-mapping-broken.h | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/include/asm-generic/dma-mapping-broken.h
b/include/asm-generic/dma-mapping-broken.h
index a7f1a55..29413d3 100644
--- a/include/asm-generic/dma-mapping-broken.h
+++ b/include/asm-generic/dma-mapping-broken.h
@@ -3,7 +3,6 @@
/* This is used for archs that do not support DMA */
-
static inline void *
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
gfp_t flag)
@@ -19,4 +18,7 @@ dma_free_coherent(struct device *dev, size_t size, void
*cpu_addr,
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 */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
