[Linux-mips-commits]CVS: linux/arch/mips/kernel pci-dma.c,1.6,1.7

[James S. <jsi...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/kernel
In directory usw-pr-cvs1:/tmp/cvs-serv19527/arch/mips/kernel

Modified Files:
	pci-dma.c 
Log Message:
Reimplement ioswapping for 32-bit <asm/io.h>.  Make support for non-coherent I/O on 32-bit MIPS option (CONFIG_NONCOHERENT_IO.  Replace CONFIG_COHERENT_IO by CONFIG_NONCOHERENT_IO. The cobalt hacks can go away now.

Index: pci-dma.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/kernel/pci-dma.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pci-dma.c	2001/11/06 00:30:42	1.6
+++ pci-dma.c	2001/11/26 19:02:22	1.7
@@ -28,7 +28,7 @@
 
 	if (ret != NULL) {
 		memset(ret, 0, size);
-#ifndef CONFIG_COHERENT_IO
+#ifdef CONFIG_NONCOHERENT_IO
 		dma_cache_wback_inv((unsigned long) ret, size);
 		ret = KSEG1ADDR(ret);
 #endif
@@ -43,7 +43,7 @@
 {
 	unsigned long addr = (unsigned long) vaddr;
 
-#ifndef CONFIG_COHERENT_IO
+#ifdef CONFIG_NONCOHERENT_IO
 	addr = KSEG0ADDR(addr);
 #endif
 	free_pages(addr, get_order(size));