diff options
author | Dave Airlie <airlied@starflyer-ubuntu.(none)> | 2006-08-29 00:01:19 +1000 |
---|---|---|
committer | Dave Airlie <airlied@starflyer-ubuntu.(none)> | 2006-08-29 00:01:19 +1000 |
commit | 3cfab681b3c82c7951f1cc337d2021a6f0d08b1e (patch) | |
tree | 4d880f5961a0fe31bddf80391923f117add9e674 /linux-core/drm_vm.c | |
parent | 88928380c87e60d22a0a9698c468036f180f0761 (diff) | |
parent | 9b984b34e99f694e10251e15bc2ec1bc844dcca4 (diff) |
Merge branch 'master' into nouveau-1
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 0391395d..9672269a 100644 --- a/linux-core/drm_vm.c +++ b/linux-core/drm_vm.c @@ -70,7 +70,7 @@ static __inline__ struct page *drm_do_vm_nopage(struct vm_area_struct *vma, if (!dev->agp || !dev->agp->cant_use_aperture) goto vm_nopage_error; - if (drm_ht_find_item(&dev->map_hash, VM_OFFSET(vma), &hash)) + if (drm_ht_find_item(&dev->map_hash, VM_OFFSET(vma), &hash)) goto vm_nopage_error; r_list = drm_hash_entry(hash, drm_map_list_t, hash); |