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_proc.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_proc.c')
-rw-r--r-- | drivers/gpu/drm/drm_proc.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/gpu/drm/drm_proc.c b/drivers/gpu/drm/drm_proc.c index bae5391165ac..bbd4b3d1074a 100644 --- a/drivers/gpu/drm/drm_proc.c +++ b/drivers/gpu/drm/drm_proc.c | |||
@@ -105,13 +105,12 @@ int drm_proc_create_files(struct drm_info_list *files, int count, | |||
105 | (dev->driver->driver_features & features) != features) | 105 | (dev->driver->driver_features & features) != features) |
106 | continue; | 106 | continue; |
107 | 107 | ||
108 | tmp = drm_alloc(sizeof(struct drm_info_node), _DRM_DRIVER); | 108 | tmp = kmalloc(sizeof(struct drm_info_node), GFP_KERNEL); |
109 | ent = create_proc_entry(files[i].name, S_IFREG | S_IRUGO, root); | 109 | ent = create_proc_entry(files[i].name, S_IFREG | S_IRUGO, root); |
110 | if (!ent) { | 110 | if (!ent) { |
111 | DRM_ERROR("Cannot create /proc/dri/%s/%s\n", | 111 | DRM_ERROR("Cannot create /proc/dri/%s/%s\n", |
112 | name, files[i].name); | 112 | name, files[i].name); |
113 | drm_free(tmp, sizeof(struct drm_info_node), | 113 | kfree(tmp); |
114 | _DRM_DRIVER); | ||
115 | ret = -1; | 114 | ret = -1; |
116 | goto fail; | 115 | goto fail; |
117 | } | 116 | } |
@@ -192,8 +191,7 @@ int drm_proc_remove_files(struct drm_info_list *files, int count, | |||
192 | remove_proc_entry(files[i].name, | 191 | remove_proc_entry(files[i].name, |
193 | minor->proc_root); | 192 | minor->proc_root); |
194 | list_del(pos); | 193 | list_del(pos); |
195 | drm_free(tmp, sizeof(struct drm_info_node), | 194 | kfree(tmp); |
196 | _DRM_DRIVER); | ||
197 | } | 195 | } |
198 | } | 196 | } |
199 | } | 197 | } |