diff options
| author | Steve French <sfrench@us.ibm.com> | 2007-11-25 04:53:27 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2007-11-25 04:53:27 -0500 |
| commit | 058250a0d5886b4d96a195ecc7e3a75e2df5e4b1 (patch) | |
| tree | fb67e8f5258c6aa11d4e8c39650e23de7556b38d /arch/arm/mm/consistent.c | |
| parent | cea218054ad277d6c126890213afde07b4eb1602 (diff) | |
| parent | 2ffbb8377c7a0713baf6644e285adc27a5654582 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/arm/mm/consistent.c')
| -rw-r--r-- | arch/arm/mm/consistent.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mm/consistent.c b/arch/arm/mm/consistent.c index cefdf2f9f26e..333a82a3717e 100644 --- a/arch/arm/mm/consistent.c +++ b/arch/arm/mm/consistent.c | |||
| @@ -322,7 +322,6 @@ static int dma_mmap(struct device *dev, struct vm_area_struct *vma, | |||
| 322 | 322 | ||
| 323 | if (off < kern_size && | 323 | if (off < kern_size && |
| 324 | user_size <= (kern_size - off)) { | 324 | user_size <= (kern_size - off)) { |
| 325 | vma->vm_flags |= VM_RESERVED; | ||
| 326 | ret = remap_pfn_range(vma, vma->vm_start, | 325 | ret = remap_pfn_range(vma, vma->vm_start, |
| 327 | page_to_pfn(c->vm_pages) + off, | 326 | page_to_pfn(c->vm_pages) + off, |
| 328 | user_size << PAGE_SHIFT, | 327 | user_size << PAGE_SHIFT, |