Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 356117
b: refs/heads/master
c: e978948
h: refs/heads/master
i:
  356115: ee73aac
v: v3
  • Loading branch information
Heiko Carstens authored and Martin Schwidefsky committed Feb 14, 2013
1 parent ad07ab3 commit 26fbe36
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e06ef372839c0c33f5f91f892ae632cef38cd259
refs/heads/master: e978948db125cc3b90cc324c68e7787f0ac7be4a
7 changes: 5 additions & 2 deletions trunk/arch/s390/include/asm/dma-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,11 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)

extern int dma_set_mask(struct device *dev, u64 mask);
extern int dma_is_consistent(struct device *dev, dma_addr_t dma_handle);
extern void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction);

static inline void dma_cache_sync(struct device *dev, void *vaddr, size_t size,
enum dma_data_direction direction)
{
}

#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)
Expand Down

0 comments on commit 26fbe36

Please sign in to comment.