drm: remove last usage of VM_OFFSET

diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h
index 0dee356..9692492 100644 (file)
--- a/linux-core/drm_compat.h
+++ b/linux-core/drm_compat.h
@@ -97,8 +97,6 @@
 #define __GFP_COMP 0
 #endif
 
-#define VM_OFFSET(vma) ((vma)->vm_pgoff << PAGE_SHIFT)
-
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
 static inline int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t pgprot)
 {

diff --git a/linux-core/i810_dma.c b/linux-core/i810_dma.c
index ad4d2fc..4146700 100644 (file)
--- a/linux-core/i810_dma.c
+++ b/linux-core/i810_dma.c
@@ -125,8 +125,8 @@ static int i810_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
        unlock_kernel();
 
        if (io_remap_pfn_range(vma, vma->vm_start,
-                           VM_OFFSET(vma) >> PAGE_SHIFT,
-                           vma->vm_end - vma->vm_start, vma->vm_page_prot))
+                              vma->vm_pgoff,
+                              vma->vm_end - vma->vm_start, vma->vm_page_prot))
                return -EAGAIN;
        return 0;
 }

diff --git a/linux-core/i830_dma.c b/linux-core/i830_dma.c
index e93307f..406a3ff 100644 (file)
--- a/linux-core/i830_dma.c
+++ b/linux-core/i830_dma.c
@@ -110,7 +110,7 @@ static int i830_mmap_buffers(struct file *filp, struct vm_area_struct *vma)
        unlock_kernel();
 
        if (remap_pfn_range(vma, vma->vm_start,
-                           VM_OFFSET(vma) >> PAGE_SHIFT,
+                           vma->vm_pgoff,
                            vma->vm_end - vma->vm_start,
                            vma->vm_page_prot))
                return -EAGAIN;