Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 91012
b: refs/heads/master
c: ae17a63
h: refs/heads/master
v: v3
  • Loading branch information
Glauber Costa authored and Ingo Molnar committed Apr 19, 2008
1 parent 9b1cc60 commit 44d8672
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 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: c786df08f6df2833e34e78cee5ef62558e3b5346
refs/heads/master: ae17a63b096b05007bacafd2f92414b881a0b4b4
14 changes: 14 additions & 0 deletions trunk/include/asm-x86/dma-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,18 @@ dma_cache_sync(struct device *dev, void *vaddr, size_t size,
{
flush_write_buffers();
}

#ifdef CONFIG_X86_32
# define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
extern int
dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
dma_addr_t device_addr, size_t size, int flags);

extern void
dma_release_declared_memory(struct device *dev);

extern void *
dma_mark_declared_memory_occupied(struct device *dev,
dma_addr_t device_addr, size_t size);
#endif /* CONFIG_X86_32 */
#endif
12 changes: 0 additions & 12 deletions trunk/include/asm-x86/dma-mapping_32.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,4 @@ dma_get_cache_alignment(void)

#define dma_is_consistent(d, h) (1)

#define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY
extern int
dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr,
dma_addr_t device_addr, size_t size, int flags);

extern void
dma_release_declared_memory(struct device *dev);

extern void *
dma_mark_declared_memory_occupied(struct device *dev,
dma_addr_t device_addr, size_t size);

#endif

0 comments on commit 44d8672

Please sign in to comment.