summaryrefslogtreecommitdiffstats
path: root/drivers/char/drm/drm_mm.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-08-14 03:35:15 +0200
committerDave Airlie <airlied@linux.ie>2006-09-21 21:32:32 +0200
commita1d0fcf5a1cf56ae4711c7e0f857832724a67e8b (patch)
tree2773f67ec366cecdf18de83a0df867ce7164fe93 /drivers/char/drm/drm_mm.c
parentdrm: Add support for Intel i965G chipsets. (diff)
downloadlinux-a1d0fcf5a1cf56ae4711c7e0f857832724a67e8b.tar.xz
linux-a1d0fcf5a1cf56ae4711c7e0f857832724a67e8b.zip
drm: remove FALSE/TRUE that snuck in with simple memory manager changes.
Thanks to Andrew Morton for pointing these out, I've fixed a few his patch missed. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/drm_mm.c')
-rw-r--r--drivers/char/drm/drm_mm.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/char/drm/drm_mm.c b/drivers/char/drm/drm_mm.c
index c55ed45a8944..617526bd5b0c 100644
--- a/drivers/char/drm/drm_mm.c
+++ b/drivers/char/drm/drm_mm.c
@@ -54,7 +54,7 @@ drm_mm_node_t *drm_mm_get_block(drm_mm_node_t * parent,
if (parent->size == size) {
list_del_init(&parent->fl_entry);
- parent->free = FALSE;
+ parent->free = 0;
return parent;
} else {
child = (drm_mm_node_t *) drm_alloc(sizeof(*child), DRM_MEM_MM);
@@ -64,7 +64,7 @@ drm_mm_node_t *drm_mm_get_block(drm_mm_node_t * parent,
INIT_LIST_HEAD(&child->ml_entry);
INIT_LIST_HEAD(&child->fl_entry);
- child->free = FALSE;
+ child->free = 0;
child->size = size;
child->start = parent->start;
@@ -89,13 +89,13 @@ void drm_mm_put_block(drm_mm_t * mm, drm_mm_node_t * cur)
drm_mm_node_t *prev_node = NULL;
drm_mm_node_t *next_node;
- int merged = FALSE;
+ int merged = 0;
if (cur_head->prev != root_head) {
prev_node = list_entry(cur_head->prev, drm_mm_node_t, ml_entry);
if (prev_node->free) {
prev_node->size += cur->size;
- merged = TRUE;
+ merged = 1;
}
}
if (cur_head->next != root_head) {
@@ -110,12 +110,12 @@ void drm_mm_put_block(drm_mm_t * mm, drm_mm_node_t * cur)
} else {
next_node->size += cur->size;
next_node->start = cur->start;
- merged = TRUE;
+ merged = 1;
}
}
}
if (!merged) {
- cur->free = TRUE;
+ cur->free = 1;
list_add(&cur->fl_entry, &list_root->fl_entry);
} else {
list_del(&cur->ml_entry);
@@ -169,7 +169,7 @@ int drm_mm_init(drm_mm_t * mm, unsigned long start, unsigned long size)
child->start = start;
child->size = size;
- child->free = TRUE;
+ child->free = 1;
list_add(&child->fl_entry, &mm->root_node.fl_entry);
list_add(&child->ml_entry, &mm->root_node.ml_entry);