diff options
| author | Nian Wu <nian@graphics.(none)> | 2007-02-25 17:06:13 -0800 |
|---|---|---|
| committer | Nian Wu <nian@graphics.(none)> | 2007-02-25 17:06:13 -0800 |
| commit | df2fc3ec62d6799a3266cfb18b1279a126892f44 (patch) | |
| tree | 94d39b9172bce8c93cb035e40d12e635dfaeb12f /linux-core/i830_dma.c | |
| parent | 80095ffe01efe79983c2124ecc99ce979d7ac6a9 (diff) | |
| parent | 9d8ba2d0d479f53b996c0a0e366acfee52daab3b (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Diffstat (limited to 'linux-core/i830_dma.c')
| -rw-r--r-- | linux-core/i830_dma.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |