diff options
| author | Dave Airlie | 2005-07-07 12:33:26 +0200 |
|---|---|---|
| committer | Dave Airlie | 2005-07-07 12:33:26 +0200 |
| commit | b9523249de59c49e7c2cc83dfa73fb011a489a45 (patch) | |
| tree | 0cebe6a2eeec658f6beb588fb7c9b6e5a5af4033 | |
| parent | drm: ctx release can happen before dev->ctxlist is allocated (diff) | |
| download | kernel-qcow2-linux-b9523249de59c49e7c2cc83dfa73fb011a489a45.tar.gz kernel-qcow2-linux-b9523249de59c49e7c2cc83dfa73fb011a489a45.tar.xz kernel-qcow2-linux-b9523249de59c49e7c2cc83dfa73fb011a489a45.zip | |
drm: use kcalloc now that it is available..
Make the DRM drm_calloc call kcalloc now.
Signed-off-by: Dave Airlie <airlied@linux.ie>
| -rw-r--r-- | drivers/char/drm/drmP.h | 8 | ||||
| -rw-r--r-- | drivers/char/drm/drm_memory.c | 13 |
2 files changed, 7 insertions, 14 deletions
diff --git a/drivers/char/drm/drmP.h b/drivers/char/drm/drmP.h index b04ddf12a0ff..2c7b1fc3bb2e 100644 --- a/drivers/char/drm/drmP.h +++ b/drivers/char/drm/drmP.h @@ -806,7 +806,6 @@ extern ssize_t drm_read(struct file *filp, char __user *buf, size_t count, extern void drm_mem_init(void); extern int drm_mem_info(char *buf, char **start, off_t offset, int request, int *eof, void *data); -extern void *drm_calloc(size_t nmemb, size_t size, int area); extern void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area); extern unsigned long drm_alloc_pages(int order, int area); @@ -1064,9 +1063,16 @@ static __inline__ void drm_free(void *pt, size_t size, int area) { kfree(pt); } + +/** Wrapper around kcalloc() */ +static __inline__ void *drm_calloc(size_t nmemb, size_t size, int area) +{ + return kcalloc(nmemb, size, GFP_KERNEL); +} #else extern void *drm_alloc(size_t size, int area); extern void drm_free(void *pt, size_t size, int area); +extern void *drm_calloc(size_t nmemb, size_t size, int area); #endif /*@}*/ diff --git a/drivers/char/drm/drm_memory.c b/drivers/char/drm/drm_memory.c index 7f53f756c052..ace3d42f4407 100644 --- a/drivers/char/drm/drm_memory.c +++ b/drivers/char/drm/drm_memory.c @@ -65,19 +65,6 @@ int drm_mem_info(char *buf, char **start, off_t offset, return 0; } -/** Wrapper around kmalloc() */ -void *drm_calloc(size_t nmemb, size_t size, int area) -{ - void *addr; - - addr = kmalloc(size * nmemb, GFP_KERNEL); - if (addr != NULL) - memset((void *)addr, 0, size * nmemb); - - return addr; -} -EXPORT_SYMBOL(drm_calloc); - /** Wrapper around kmalloc() and kfree() */ void *drm_realloc(void *oldpt, size_t oldsize, size_t size, int area) { |