diff options
author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-02-07 12:52:23 +0100 |
---|---|---|
committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-02-07 12:52:23 +0100 |
commit | af24465b2eddfcc5296edc830ea5ed86065a4abd (patch) | |
tree | c6697000597052241d8877e2fa97a5161b14fe6a /linux-core/drm_vm.c | |
parent | 71b9e876f99db219fcbf4e3ab977b64b068cc2b4 (diff) |
Fix a stray unlock_kernel() in drm_vm.c
Add a file for memory move helpers, drm_bo_move.c
Implement generic memory move.
Cached, no_move and unmapped memory temporarily broken.
Diffstat (limited to 'linux-core/drm_vm.c')
-rw-r--r-- | linux-core/drm_vm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/drm_vm.c b/linux-core/drm_vm.c index 843fc362..416ac4ae 100644 --- a/linux-core/drm_vm.c +++ b/linux-core/drm_vm.c @@ -513,7 +513,6 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma) /* Length must match exact page count */ if (!dma || (length >> PAGE_SHIFT) != dma->page_count) { - unlock_kernel(); return -EINVAL; } @@ -588,6 +587,7 @@ static int drm_mmap_locked(struct file *filp, struct vm_area_struct *vma) * the AGP mapped at physical address 0 * --BenH. */ + if (!vma->vm_pgoff #if __OS_HAS_AGP && (!dev->agp |