diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-16 21:32:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-16 21:32:08 -0500 |
| commit | 0048e1c44a4529d4ea93e6920fa5468730c68c94 (patch) | |
| tree | b5d93514eee9cea4e5d0b933b604e8bb95e7655e /arch/arm/mm/consistent.c | |
| parent | 4c5cdb1e1f2a502069f57a60b5c6b97b8106c73c (diff) | |
| parent | 2a0d7187340ca192ccc061a86c8a55be5e7627f0 (diff) | |
Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 4638/1: pxa: use PXA3xx specific macros to define clks
[ARM] remove useless setting of VM_RESERVED
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, |