cvs diff: Diffing .
Index: drm_memory.c
===================================================================
RCS file: /cvsroot/r300/r300_driver/drm/linux-core/drm_memory.c,v
retrieving revision 1.1
diff -u -r1.1 drm_memory.c
--- drm_memory.c 23 Oct 2004 12:43:44 -0000 1.1
+++ drm_memory.c 8 Feb 2005 08:31:28 -0000
@@ -106,7 +106,8 @@
unsigned long addr;
unsigned int sz;- address = __get_free_pages(GFP_KERNEL, order);
+ dma_addr_t dma;
+ address = dma_alloc_coherent(0, PAGE_SIZE<< order, &dma, GFP_KERNEL);
if (!address)
return 0;
Index: drm_vm.c
===================================================================
RCS file: /cvsroot/r300/r300_driver/drm/linux-core/drm_vm.c,v
retrieving revision 1.1
diff -u -r1.1 drm_vm.c
--- drm_vm.c 23 Oct 2004 12:43:44 -0000 1.1
+++ drm_vm.c 8 Feb 2005 08:31:28 -0000
@@ -645,7 +645,7 @@
vma->vm_end - vma->vm_start,
vma->vm_page_prot, 0))
#else
- if (remap_pfn_range(vma, vma->vm_start,
+ if (io_remap_page_range(vma, vma->vm_start,
(VM_OFFSET(vma) + offset) >> PAGE_SHIFT,
vma->vm_end - vma->vm_start,
vma->vm_page_prot))
Jacob
------------------------------------------------------- SF email is sponsored by - The IT Product Guide Read honest & candid reviews on hundreds of IT Products from real users. Discover which products truly live up to the hype. Start reading now. http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click -- _______________________________________________ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
