* [PATCH] s390: Use include/asm-generic/dma-mapping-broken.h
@ 2004-07-18 20:23 Arthur Othieno
0 siblings, 0 replies; 2+ messages in thread
From: Arthur Othieno @ 2004-07-18 20:23 UTC (permalink / raw)
To: akpm; +Cc: schwidefsky, linux-kernel
Hi,
ChangeSet 1.1371.413.23 [1] introduced the file
include/asm-generic/dma-mapping-broken.h for architectures that don't
support the new DMA API. I don't know if this is the case with s390,
however, ChangeSet 1.1371.445.6 [2] introduced a set of changes that
duplicate those in include/asm-generic/dma-mapping-broken.h.
This patch squishes that duplication by simply including
include/asm-generic/dma-mapping-broken.h in
include/asm-s390/dma-mapping.h.
Against 2.6.7, but applies cleanly against 2.6.8-rc2. Thanks.
[1] http://tinyurl.com/7y2d9
[2] http://tinyurl.com/5qybl
Signed-off-by: Arthur Othieno <a.othieno@bluewin.ch>
dma-mapping.h | 13 +------------
1 files changed, 1 insertion(+), 12 deletions(-)
--- a/include/asm-s390/dma-mapping.h 2004-04-11 14:05:20.000000000 +0200
+++ b/include/asm-s390/dma-mapping.h 2004-05-03 00:36:56.000000000 +0200
@@ -9,17 +9,6 @@
#ifndef _ASM_DMA_MAPPING_H
#define _ASM_DMA_MAPPING_H
-static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t *dma_handle, int flag)
-{
- BUG();
- return 0;
-}
-
-static inline void dma_free_coherent(struct device *dev, size_t size,
- void *vaddr, dma_addr_t dma_handle)
-{
- BUG();
-}
+#include <asm-generic/dma-mapping-broken.h>
#endif /* _ASM_DMA_MAPPING_H */
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] s390: Use include/asm-generic/dma-mapping-broken.h
@ 2004-07-18 20:29 Arthur Othieno
0 siblings, 0 replies; 2+ messages in thread
From: Arthur Othieno @ 2004-07-18 20:29 UTC (permalink / raw)
To: akpm; +Cc: schwidefsky, linux-kernel
Hi,
ChangeSet 1.1371.413.23 [1] introduced the file
include/asm-generic/dma-mapping-broken.h for architectures that don't
support the new DMA API. I don't know if this is the case with s390,
however, ChangeSet 1.1371.445.6 [2] introduced a set of changes that
duplicate those in include/asm-generic/dma-mapping-broken.h.
This patch squishes that duplication by simply including
include/asm-generic/dma-mapping-broken.h in
include/asm-s390/dma-mapping.h.
Against 2.6.7, but applies cleanly against 2.6.8-rc2. Thanks.
[1] http://tinyurl.com/7y2d9
[2] http://tinyurl.com/5qybl
Signed-off-by: Arthur Othieno <a.othieno@bluewin.ch>
dma-mapping.h | 13 +------------
1 files changed, 1 insertion(+), 12 deletions(-)
--- a/include/asm-s390/dma-mapping.h 2004-04-11 14:05:20.000000000 +0200
+++ b/include/asm-s390/dma-mapping.h 2004-05-03 00:36:56.000000000 +0200
@@ -9,17 +9,6 @@
#ifndef _ASM_DMA_MAPPING_H
#define _ASM_DMA_MAPPING_H
-static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t *dma_handle, int flag)
-{
- BUG();
- return 0;
-}
-
-static inline void dma_free_coherent(struct device *dev, size_t size,
- void *vaddr, dma_addr_t dma_handle)
-{
- BUG();
-}
+#include <asm-generic/dma-mapping-broken.h>
#endif /* _ASM_DMA_MAPPING_H */
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2004-07-18 20:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-07-18 20:23 [PATCH] s390: Use include/asm-generic/dma-mapping-broken.h Arthur Othieno
-- strict thread matches above, loose matches on Subject: below --
2004-07-18 20:29 Arthur Othieno
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox