diff options
| author | Dave Airlie <airlied@linux.ie> | 2007-02-18 17:59:40 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-02-18 17:59:40 +1100 |
| commit | a253de2fcfa11abadd4697a9d89137adf3f35f78 (patch) | |
| tree | 40b6c52b00e90dc6b3e3ed506e3b4bd03880e834 | |
| parent | 6d8ed5aedda27ec238aac3d69fb9dfadc82bfa9a (diff) | |
drm: remove last usage of VM_OFFSET
| -rw-r--r-- | linux-core/drm_compat.h | 2 | ||||
| -rw-r--r-- | linux-core/i810_dma.c | 4 | ||||
| -rw-r--r-- | linux-core/i830_dma.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h index 0dee3564..9692492d 100644 --- 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 ad4d2fce..41467001 100644 --- 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 e93307fb..406a3ff7 100644 --- 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; |