From: <aot...@us...> - 2004-06-16 17:30:55
|
Update of /cvsroot/gc-linux/linux/include/asm-ppc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31080/include/asm-ppc Modified Files: io.h Log Message: Merged 2.6.7 Index: io.h =================================================================== RCS file: /cvsroot/gc-linux/linux/include/asm-ppc/io.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- io.h 29 Apr 2004 19:08:07 -0000 1.1 +++ io.h 16 Jun 2004 17:30:45 -0000 1.2 @@ -388,43 +388,5 @@ return 0; } -#ifdef CONFIG_NOT_COHERENT_CACHE - -/* - * DMA-consistent mapping functions for PowerPCs that don't support - * cache snooping. These allocate/free a region of uncached mapped - * memory space for use with DMA devices. Alternatively, you could - * allocate the space "normally" and use the cache management functions - * to ensure it is consistent. - */ -extern void *consistent_alloc(int gfp, size_t size, dma_addr_t *handle); -extern void consistent_free(void *vaddr); -extern void consistent_sync(void *vaddr, size_t size, int rw); -extern void consistent_sync_page(struct page *page, unsigned long offset, - size_t size, int rw); - -#define dma_cache_inv(_start,_size) \ - invalidate_dcache_range(_start, (_start + _size)) -#define dma_cache_wback(_start,_size) \ - clean_dcache_range(_start, (_start + _size)) -#define dma_cache_wback_inv(_start,_size) \ - flush_dcache_range(_start, (_start + _size)) - -#else /* ! CONFIG_NOT_COHERENT_CACHE */ - -/* - * Cache coherent cores. - */ - -#define dma_cache_inv(_start,_size) do { } while (0) -#define dma_cache_wback(_start,_size) do { } while (0) -#define dma_cache_wback_inv(_start,_size) do { } while (0) - -#define consistent_alloc(gfp, size, handle) NULL -#define consistent_free(addr) do { } while (0) -#define consistent_sync(addr, size, rw) do { } while (0) -#define consistent_sync_page(pg, off, sz, rw) do { } while (0) - -#endif /* ! CONFIG_NOT_COHERENT_CACHE */ #endif /* _PPC_IO_H */ #endif /* __KERNEL__ */ |