patch-2.4.0-test2 linux/arch/sparc/kernel/ioport.c

• Lines: 42
• Date: Thu Jun 22 07:21:12 2000
• Orig file: v2.4.0-test1/linux/arch/sparc/kernel/ioport.c
• Orig date: Tue Apr 11 15:09:14 2000

diff -u --recursive --new-file v2.4.0-test1/linux/arch/sparc/kernel/ioport.c linux/arch/sparc/kernel/ioport.c
@@ -1,4 +1,4 @@
-/* $Id: ioport.c,v 1.37 2000/03/28 06:38:19 davem Exp $
+/* $Id: ioport.c,v 1.39 2000/06/20 01:10:00 anton Exp $
  * ioport.c:  Simple io mapping allocator.
  *
  * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
@@ -43,6 +43,8 @@
 #include <asm/pgalloc.h>
 #include <asm/pgtable.h>
 
+#define mmu_inval_dma_area(p, l)	/* Anton pulled it out for 2.4.0-xx */
+
 struct resource *_sparc_find_resource(struct resource *r, unsigned long);
 
 static void *_sparc_ioremap(struct resource *res, u32 bus, u32 pa, int sz);
@@ -52,11 +54,11 @@
 
 /* This points to the next to use virtual memory for DVMA mappings */
 static struct resource _sparc_dvma = {
-	"sparc_dvma", DVMA_VADDR, DVMA_VADDR + DVMA_LEN - 1
+	"sparc_dvma", DVMA_VADDR, DVMA_END - 1
 };
 /* This points to the start of I/O mappings, cluable from outside. */
 /*ext*/ struct resource sparc_iomap = {
-	"sparc_iomap", IOBASE_VADDR, IOBASE_END-1
+	"sparc_iomap", IOBASE_VADDR, IOBASE_END - 1
 };
 
 /*
@@ -453,7 +455,11 @@
 		panic("sbus_dma_sync_single: 0x%x\n", ba);
 
 	va = (unsigned long) phys_to_virt(mmu_translate_dvma(ba));
-	mmu_inval_dma_area(va, (size + PAGE_SIZE-1) & PAGE_MASK);
+	/*
+	 * XXX This bogosity will be fixed with the iommu rewrite coming soon
+	 * to a kernel near you. - Anton
+	 */
+	/* mmu_inval_dma_area(va, (size + PAGE_SIZE-1) & PAGE_MASK); */
 }
 
 void sbus_dma_sync_sg(struct sbus_dev *sdev, struct scatterlist *sg, int n, int direction)