diff options
author | Eric Anholt <eric@anholt.net> | 2009-03-24 15:23:04 -0400 |
---|---|---|
committer | Eric Anholt <eric@anholt.net> | 2009-06-18 16:00:33 -0400 |
commit | 9a298b2acd771d8a5c0004d8f8e4156c65b11f6b (patch) | |
tree | f8bf6cfe675492cb881abb50d9aa9aa8f38733d6 /drivers/gpu/drm/drm_vm.c | |
parent | 52dc7d32b88156248167864f77a9026abe27b432 (diff) |
drm: Remove memory debugging infrastructure.
It hasn't been used in ages, and having the user tell your how much
memory is being freed at free time is a recipe for disaster even if it
was ever used.
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/drm_vm.c')
-rw-r--r-- | drivers/gpu/drm/drm_vm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index 22f76567ac7d..f95d03ac9784 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c | |||
@@ -227,7 +227,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma) | |||
227 | found_maps++; | 227 | found_maps++; |
228 | if (pt->vma == vma) { | 228 | if (pt->vma == vma) { |
229 | list_del(&pt->head); | 229 | list_del(&pt->head); |
230 | drm_free(pt, sizeof(*pt), DRM_MEM_VMAS); | 230 | kfree(pt); |
231 | } | 231 | } |
232 | } | 232 | } |
233 | 233 | ||
@@ -273,7 +273,7 @@ static void drm_vm_shm_close(struct vm_area_struct *vma) | |||
273 | DRM_ERROR("tried to rmmap GEM object\n"); | 273 | DRM_ERROR("tried to rmmap GEM object\n"); |
274 | break; | 274 | break; |
275 | } | 275 | } |
276 | drm_free(map, sizeof(*map), DRM_MEM_MAPS); | 276 | kfree(map); |
277 | } | 277 | } |
278 | } | 278 | } |
279 | mutex_unlock(&dev->struct_mutex); | 279 | mutex_unlock(&dev->struct_mutex); |
@@ -414,7 +414,7 @@ void drm_vm_open_locked(struct vm_area_struct *vma) | |||
414 | vma->vm_start, vma->vm_end - vma->vm_start); | 414 | vma->vm_start, vma->vm_end - vma->vm_start); |
415 | atomic_inc(&dev->vma_count); | 415 | atomic_inc(&dev->vma_count); |
416 | 416 | ||
417 | vma_entry = drm_alloc(sizeof(*vma_entry), DRM_MEM_VMAS); | 417 | vma_entry = kmalloc(sizeof(*vma_entry), GFP_KERNEL); |
418 | if (vma_entry) { | 418 | if (vma_entry) { |
419 | vma_entry->vma = vma; | 419 | vma_entry->vma = vma; |
420 | vma_entry->pid = current->pid; | 420 | vma_entry->pid = current->pid; |
@@ -454,7 +454,7 @@ static void drm_vm_close(struct vm_area_struct *vma) | |||
454 | list_for_each_entry_safe(pt, temp, &dev->vmalist, head) { | 454 | list_for_each_entry_safe(pt, temp, &dev->vmalist, head) { |
455 | if (pt->vma == vma) { | 455 | if (pt->vma == vma) { |
456 | list_del(&pt->head); | 456 | list_del(&pt->head); |
457 | drm_free(pt, sizeof(*pt), DRM_MEM_VMAS); | 457 | kfree(pt); |
458 | break; | 458 | break; |
459 | } | 459 | } |
460 | } | 460 | } |