1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index 22f76567ac7d..7e1fbe5d4779 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -144,14 +144,14 @@ static int drm_do_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                  * Get the page, inc the use count, and return it
                  */
                 offset = (baddr - agpmem->bound) >> PAGE_SHIFT;
-                page = virt_to_page(__va(agpmem->memory->memory[offset]));
+                page = agpmem->memory->pages[offset];
                 get_page(page);
                 vmf->page = page;
 
                 DRM_DEBUG
                     ("baddr = 0x%llx page = 0x%p, offset = 0x%llx, count=%d\n",
                      (unsigned long long)baddr,
-                     __va(agpmem->memory->memory[offset]),
+                     agpmem->memory->pages[offset],
                      (unsigned long long)offset,
                      page_count(page));
                 return 0;
@@ -227,7 +227,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
                         found_maps++;
                 if (pt->vma == vma) {
                         list_del(&pt->head);
-                        drm_free(pt, sizeof(*pt), DRM_MEM_VMAS);
+                        kfree(pt);
                 }
         }
 
@@ -273,7 +273,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
                                 DRM_ERROR("tried to rmmap GEM object\n");
                                 break;
                         }
-                        drm_free(map, sizeof(*map), DRM_MEM_MAPS);
+                        kfree(map);
                 }
         }
         mutex_unlock(&dev->struct_mutex);
@@ -414,7 +414,7 @@ void drm_vm_open_locked(struct vm_area_struct *vma)
                   vma->vm_start, vma->vm_end - vma->vm_start);
         atomic_inc(&dev->vma_count);
 
-        vma_entry = drm_alloc(sizeof(*vma_entry), DRM_MEM_VMAS);
+        vma_entry = kmalloc(sizeof(*vma_entry), GFP_KERNEL);
         if (vma_entry) {
                 vma_entry->vma = vma;
                 vma_entry->pid = current->pid;
@@ -454,7 +454,7 @@ static void drm_vm_close(struct vm_area_struct *vma)
         list_for_each_entry_safe(pt, temp, &dev->vmalist, head) {
                 if (pt->vma == vma) {
                         list_del(&pt->head);
-                        drm_free(pt, sizeof(*pt), DRM_MEM_VMAS);
+                        kfree(pt);
                         break;
                 }
         }