patch-2.4.0-test2 linux/arch/alpha/kernel/pci_iommu.c

Next file: linux/arch/alpha/kernel/proto.h
Previous file: linux/arch/alpha/kernel/pci.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test1/linux/arch/alpha/kernel/pci_iommu.c linux/arch/alpha/kernel/pci_iommu.c
@@ -97,8 +97,8 @@
 	}
 
 	if (i < n) {
-		/* Reached the end.  Flush the TLB and restart the
-		   search from the beginning.  */
+                /* Reached the end.  Flush the TLB and restart the
+                   search from the beginning.  */
 		alpha_mv.mv_pci_tbi(arena->hose, 0, -1);
 
 		p = 0, i = 0;
@@ -139,7 +139,7 @@
 		p[i] = 0;
 }
 
-/* Map a single buffer of the indicate size for PCI DMA in streaming
+/* Map a single buffer of the indicated size for PCI DMA in streaming
    mode.  The 32-bit PCI bus mastering address to use is returned.
    Once the device is given the dma address, the device owns this memory
    until either pci_unmap_single or pci_dma_sync_single is performed.  */
@@ -250,9 +250,12 @@
 	npages = calc_npages((dma_addr & ~PAGE_MASK) + size);
 	iommu_arena_free(arena, dma_ofs, npages);
 
-	/* If we're freeing ptes above the `next_entry' pointer, they
-	   may have snuck back into the TLB since the last wrap flush.
-	   We need to flush the TLB before reallocating these.  */
+
+        /*
+	   If we're freeing ptes above the `next_entry' pointer (they
+           may have snuck back into the TLB since the last wrap flush),
+           we need to flush the TLB before reallocating the latter.
+	*/
 	if (dma_ofs >= arena->next_entry)
 		alpha_mv.mv_pci_tbi(hose, dma_addr, dma_addr + size - 1);
 
@@ -574,9 +577,11 @@
 		if (fend < tend) fend = tend;
 	}
 
-	/* If we're freeing ptes above the `next_entry' pointer, they
-	   may have snuck back into the TLB since the last wrap flush.
-	   We need to flush the TLB before reallocating these.  */
+        /*
+	   If we're freeing ptes above the `next_entry' pointer (they
+           may have snuck back into the TLB since the last wrap flush),
+           we need to flush the TLB before reallocating the latter.
+	*/
 	if ((fend - arena->dma_base) >> PAGE_SHIFT >= arena->next_entry)
 		alpha_mv.mv_pci_tbi(hose, fbeg, fend);
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)