diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 09:59:23 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-09 09:59:23 -0700 |
commit | 0109fd37046de64e8459f8c4f4706df9ac7cc82c (patch) | |
tree | 18dcdb43cc8c6cd494375f8af919024889d24d87 /drivers/char/drm/drm_memory.c | |
parent | cc14cf46da215a9df1c0a4388763a68769ef9e53 (diff) | |
parent | 850eb83a6a21b086624b227653ce90ad927ba423 (diff) |
Merge head 'drm-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
Diffstat (limited to 'drivers/char/drm/drm_memory.c')
-rw-r--r-- | drivers/char/drm/drm_memory.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/char/drm/drm_memory.c b/drivers/char/drm/drm_memory.c index 7f53f756c05..ace3d42f440 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) { |