git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
char
/
drm
/
i915_mem.c
diff --git
a/drivers/char/drm/i915_mem.c
b/drivers/char/drm/i915_mem.c
index
42c1e35
..
d54a300
100644
(file)
--- a/
drivers/char/drm/i915_mem.c
+++ b/
drivers/char/drm/i915_mem.c
@@
-7,7
+7,6
@@
*
**************************************************************************/
*
**************************************************************************/
-#include "i915.h"
#include "drmP.h"
#include "drm.h"
#include "i915_drm.h"
#include "drmP.h"
#include "drm.h"
#include "i915_drm.h"
@@
-75,7
+74,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) {
{
/* Maybe cut off the start of an existing block */
if (start > p->start) {
- struct mem_block *newblock =
DRM_MALLOC(sizeof(*newblock)
);
+ struct mem_block *newblock =
drm_alloc(sizeof(*newblock), DRM_MEM_BUFLISTS
);
if (!newblock)
goto out;
newblock->start = start;
if (!newblock)
goto out;
newblock->start = start;
@@
-91,7
+90,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) {
/* Maybe cut off the end of an existing block */
if (size < p->size) {
- struct mem_block *newblock =
DRM_MALLOC(sizeof(*newblock)
);
+ struct mem_block *newblock =
drm_alloc(sizeof(*newblock), DRM_MEM_BUFLISTS
);
if (!newblock)
goto out;
newblock->start = start + size;
if (!newblock)
goto out;
newblock->start = start + size;
@@
-148,7
+147,7
@@
static void free_block(struct mem_block *p)
p->size += q->size;
p->next = q->next;
p->next->prev = p;
p->size += q->size;
p->next = q->next;
p->next->prev = p;
-
DRM_FREE(q, sizeof(*q)
);
+
drm_free(q, sizeof(*q), DRM_MEM_BUFLISTS
);
}
if (p->prev->filp == NULL) {
}
if (p->prev->filp == NULL) {
@@
-156,7
+155,7
@@
static void free_block(struct mem_block *p)
q->size += p->size;
q->next = p->next;
q->next->prev = q;
q->size += p->size;
q->next = p->next;
q->next->prev = q;
-
DRM_FREE(p, sizeof(*q)
);
+
drm_free(p, sizeof(*q), DRM_MEM_BUFLISTS
);
}
}
}
}
@@
-164,14
+163,14
@@
static void free_block(struct mem_block *p)
*/
static int init_heap(struct mem_block **heap, int start, int size)
{
*/
static int init_heap(struct mem_block **heap, int start, int size)
{
- struct mem_block *blocks =
DRM_MALLOC(sizeof(*blocks)
);
+ struct mem_block *blocks =
drm_alloc(sizeof(*blocks), DRM_MEM_BUFLISTS
);
if (!blocks)
return -ENOMEM;
if (!blocks)
return -ENOMEM;
- *heap =
DRM_MALLOC(sizeof(**heap)
);
+ *heap =
drm_alloc(sizeof(**heap), DRM_MEM_BUFLISTS
);
if (!*heap) {
if (!*heap) {
-
DRM_FREE(blocks, sizeof(*blocks)
);
+
drm_free(blocks, sizeof(*blocks), DRM_MEM_BUFLISTS
);
return -ENOMEM;
}
return -ENOMEM;
}
@@
-211,7
+210,7
@@
void i915_mem_release(drm_device_t * dev, DRMFILE filp, struct mem_block *heap)
p->size += q->size;
p->next = q->next;
p->next->prev = p;
p->size += q->size;
p->next = q->next;
p->next->prev = p;
-
DRM_FREE(q, sizeof(*q)
);
+
drm_free(q, sizeof(*q), DRM_MEM_BUFLISTS
);
}
}
}
}
}
}
@@
-228,10
+227,10
@@
void i915_mem_takedown(struct mem_block **heap)
for (p = (*heap)->next; p != *heap;) {
struct mem_block *q = p;
p = p->next;
for (p = (*heap)->next; p != *heap;) {
struct mem_block *q = p;
p = p->next;
-
DRM_FREE(q, sizeof(*q)
);
+
drm_free(q, sizeof(*q), DRM_MEM_BUFLISTS
);
}
}
-
DRM_FREE(*heap, sizeof(**heap)
);
+
drm_free(*heap, sizeof(**heap), DRM_MEM_BUFLISTS
);
*heap = NULL;
}
*heap = NULL;
}