summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Whitwell <keith@tungstengraphics.com>2002-09-17 13:13:49 +0000
committerKeith Whitwell <keith@tungstengraphics.com>2002-09-17 13:13:49 +0000
commit1bd94607331e0d19e5fbdb92cc8ddb21d84ac713 (patch)
treea7390e89b9ed43efada671951665f49b40b44f45
parentd437905d7f159ca8b7ee147e49e04d7263917800 (diff)
kmalloc --> DRM_MALLOC
-rw-r--r--shared-core/radeon_mem.c10
-rw-r--r--shared/radeon_mem.c10
2 files changed, 8 insertions, 12 deletions
diff --git a/shared-core/radeon_mem.c b/shared-core/radeon_mem.c
index ef9821bf..dc3da797 100644
--- a/shared-core/radeon_mem.c
+++ b/shared-core/radeon_mem.c
@@ -44,8 +44,7 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
{
/* Maybe cut off the start of an existing block */
if (start > p->start) {
- struct mem_block *newblock = kmalloc(sizeof(*newblock),
- GFP_KERNEL);
+ struct mem_block *newblock = DRM_MALLOC(sizeof(*newblock));
if (!newblock)
goto out;
newblock->start = start;
@@ -61,8 +60,7 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
/* Maybe cut off the end of an existing block */
if (size < p->size) {
- struct mem_block *newblock = kmalloc(sizeof(*newblock),
- GFP_KERNEL);
+ struct mem_block *newblock = DRM_MALLOC(sizeof(*newblock));
if (!newblock)
goto out;
newblock->start = start + size;
@@ -146,12 +144,12 @@ static void print_heap( struct mem_block *heap )
*/
static int init_heap(struct mem_block **heap, int start, int size)
{
- struct mem_block *blocks = kmalloc(sizeof(*blocks), GFP_KERNEL);
+ struct mem_block *blocks = DRM_MALLOC(sizeof(*blocks));
if (!blocks)
return -ENOMEM;
- *heap = kmalloc(sizeof(**heap), GFP_KERNEL);
+ *heap = DRM_MALLOC(sizeof(**heap));
if (!*heap) {
kfree( blocks );
return -ENOMEM;
diff --git a/shared/radeon_mem.c b/shared/radeon_mem.c
index ef9821bf..dc3da797 100644
--- a/shared/radeon_mem.c
+++ b/shared/radeon_mem.c
@@ -44,8 +44,7 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
{
/* Maybe cut off the start of an existing block */
if (start > p->start) {
- struct mem_block *newblock = kmalloc(sizeof(*newblock),
- GFP_KERNEL);
+ struct mem_block *newblock = DRM_MALLOC(sizeof(*newblock));
if (!newblock)
goto out;
newblock->start = start;
@@ -61,8 +60,7 @@ static struct mem_block *split_block(struct mem_block *p, int start, int size,
/* Maybe cut off the end of an existing block */
if (size < p->size) {
- struct mem_block *newblock = kmalloc(sizeof(*newblock),
- GFP_KERNEL);
+ struct mem_block *newblock = DRM_MALLOC(sizeof(*newblock));
if (!newblock)
goto out;
newblock->start = start + size;
@@ -146,12 +144,12 @@ static void print_heap( struct mem_block *heap )
*/
static int init_heap(struct mem_block **heap, int start, int size)
{
- struct mem_block *blocks = kmalloc(sizeof(*blocks), GFP_KERNEL);
+ struct mem_block *blocks = DRM_MALLOC(sizeof(*blocks));
if (!blocks)
return -ENOMEM;
- *heap = kmalloc(sizeof(**heap), GFP_KERNEL);
+ *heap = DRM_MALLOC(sizeof(**heap));
if (!*heap) {
kfree( blocks );
return -ENOMEM;