summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--linux-core/drm_mm.c8
-rw-r--r--linux-core/drm_sman.c2
-rw-r--r--linux-core/drm_sman.h2
-rw-r--r--linux-core/sis_mm.c6
-rw-r--r--linux-core/via_mm.c4
5 files changed, 11 insertions, 11 deletions
diff --git a/linux-core/drm_mm.c b/linux-core/drm_mm.c
index 8d95cd4f..617526bd 100644
--- a/linux-core/drm_mm.c
+++ b/linux-core/drm_mm.c
@@ -95,7 +95,7 @@ void drm_mm_put_block(drm_mm_t * mm, drm_mm_node_t * cur)
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);
diff --git a/linux-core/drm_sman.c b/linux-core/drm_sman.c
index baba9139..b92f0ee7 100644
--- a/linux-core/drm_sman.c
+++ b/linux-core/drm_sman.c
@@ -91,7 +91,7 @@ static void *drm_sman_mm_allocate(void *private, unsigned long size,
drm_mm_t *mm = (drm_mm_t *) private;
drm_mm_node_t *tmp;
- tmp = drm_mm_search_free(mm, size, alignment, TRUE);
+ tmp = drm_mm_search_free(mm, size, alignment, 1);
if (!tmp) {
return NULL;
}
diff --git a/linux-core/drm_sman.h b/linux-core/drm_sman.h
index 7c48360f..ddc732a1 100644
--- a/linux-core/drm_sman.h
+++ b/linux-core/drm_sman.h
@@ -148,7 +148,7 @@ extern drm_memblock_item_t *drm_sman_alloc(drm_sman_t * sman,
extern int drm_sman_free_key(drm_sman_t * sman, unsigned int key);
/*
- * returns TRUE iff there are no stale memory blocks associated with this owner.
+ * returns 1 iff there are no stale memory blocks associated with this owner.
* Typically called to determine if we need to idle the hardware and call
* drm_sman_owner_cleanup. If there are no stale memory blocks, it removes all
* resources associated with owner.
diff --git a/linux-core/sis_mm.c b/linux-core/sis_mm.c
index c321c094..eca535fb 100644
--- a/linux-core/sis_mm.c
+++ b/linux-core/sis_mm.c
@@ -117,7 +117,7 @@ static int sis_fb_init(DRM_IOCTL_ARGS)
return ret;
}
- dev_priv->vram_initialized = TRUE;
+ dev_priv->vram_initialized = 1;
dev_priv->vram_offset = fb.offset;
mutex_unlock(&dev->struct_mutex);
@@ -217,7 +217,7 @@ static int sis_ioctl_agp_init(DRM_IOCTL_ARGS)
return ret;
}
- dev_priv->agp_initialized = TRUE;
+ dev_priv->agp_initialized = 1;
dev_priv->agp_offset = agp.offset;
mutex_unlock(&dev->struct_mutex);
@@ -291,7 +291,7 @@ sis_idle(drm_device_t *dev)
if (time_after_eq(jiffies, end)) {
DRM_ERROR("Graphics engine idle timeout. "
"Disabling idle check\n");
- dev_priv->idle_fault = TRUE;
+ dev_priv->idle_fault = 1;
}
/*
diff --git a/linux-core/via_mm.c b/linux-core/via_mm.c
index 3195c066..d97269f5 100644
--- a/linux-core/via_mm.c
+++ b/linux-core/via_mm.c
@@ -52,7 +52,7 @@ int via_agp_init(DRM_IOCTL_ARGS)
return ret;
}
- dev_priv->agp_initialized = TRUE;
+ dev_priv->agp_initialized = 1;
dev_priv->agp_offset = agp.offset;
mutex_unlock(&dev->struct_mutex);
@@ -79,7 +79,7 @@ int via_fb_init(DRM_IOCTL_ARGS)
return ret;
}
- dev_priv->vram_initialized = TRUE;
+ dev_priv->vram_initialized = 1;
dev_priv->vram_offset = fb.offset;
mutex_unlock(&dev->struct_mutex);