diff options
Diffstat (limited to 'drivers/gpu/drm/drm_hashtab.c')
| -rw-r--r-- | drivers/gpu/drm/drm_hashtab.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_hashtab.c b/drivers/gpu/drm/drm_hashtab.c index ac35145c3e20..f36b21c5b2e1 100644 --- a/drivers/gpu/drm/drm_hashtab.c +++ b/drivers/gpu/drm/drm_hashtab.c | |||
| @@ -46,8 +46,7 @@ int drm_ht_create(struct drm_open_hash *ht, unsigned int order) | |||
| 46 | ht->table = NULL; | 46 | ht->table = NULL; |
| 47 | ht->use_vmalloc = ((ht->size * sizeof(*ht->table)) > PAGE_SIZE); | 47 | ht->use_vmalloc = ((ht->size * sizeof(*ht->table)) > PAGE_SIZE); |
| 48 | if (!ht->use_vmalloc) { | 48 | if (!ht->use_vmalloc) { |
| 49 | ht->table = drm_calloc(ht->size, sizeof(*ht->table), | 49 | ht->table = kcalloc(ht->size, sizeof(*ht->table), GFP_KERNEL); |
| 50 | DRM_MEM_HASHTAB); | ||
| 51 | } | 50 | } |
| 52 | if (!ht->table) { | 51 | if (!ht->table) { |
| 53 | ht->use_vmalloc = 1; | 52 | ht->use_vmalloc = 1; |
| @@ -200,8 +199,7 @@ void drm_ht_remove(struct drm_open_hash *ht) | |||
| 200 | if (ht->use_vmalloc) | 199 | if (ht->use_vmalloc) |
| 201 | vfree(ht->table); | 200 | vfree(ht->table); |
| 202 | else | 201 | else |
| 203 | drm_free(ht->table, ht->size * sizeof(*ht->table), | 202 | kfree(ht->table); |
| 204 | DRM_MEM_HASHTAB); | ||
| 205 | ht->table = NULL; | 203 | ht->table = NULL; |
| 206 | } | 204 | } |
| 207 | } | 205 | } |
