This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / sound / oss / sonicvibes.c

diff --git a/sound/oss/sonicvibes.c b/sound/oss/sonicvibes.c
index 70c91dd..8bb6dea 100644 (file)
--- a/sound/oss/sonicvibes.c
+++ b/sound/oss/sonicvibes.c
@@ -756,7 +756,7 @@ static int prog_dmabuf(struct sv_state *s, unsigned rec)
                if ((virt_to_bus(db->rawbuf) + (PAGE_SIZE << db->buforder) - 1) & ~0xffffff)
                        printk(KERN_DEBUG "sv: DMA buffer beyond 16MB: busaddr 0x%lx  size %ld\n", 
                               virt_to_bus(db->rawbuf), PAGE_SIZE << db->buforder);
-               /* now mark the pages as reserved; otherwise remap_pfn_range doesn't do what we want */
+               /* now mark the pages as reserved; otherwise remap_page_range doesn't do what we want */
                pend = virt_to_page(db->rawbuf + (PAGE_SIZE << db->buforder) - 1);
                for (page = virt_to_page(db->rawbuf); page <= pend; page++)
                        SetPageReserved(page);
@@ -1549,9 +1549,7 @@ static int sv_mmap(struct file *file, struct vm_area_struct *vma)
        if (size > (PAGE_SIZE << db->buforder))
                goto out;
        ret = -EAGAIN;
-       if (remap_pfn_range(vma, vma->vm_start,
-                               virt_to_phys(db->rawbuf) >> PAGE_SHIFT,
-                               size, vma->vm_page_prot))
+       if (remap_page_range(vma, vma->vm_start, virt_to_phys(db->rawbuf), size, vma->vm_page_prot))
                goto out;
        db->mapped = 1;
        ret = 0;