6 files changed, 12 insertions, 12 deletions
diff --git a/src/gallium/drivers/nv40/nv40_context.c b/src/gallium/drivers/nv40/nv40_context.c
index 58627443b8..7fcf8b8619 100644
--- a/src/gallium/drivers/nv40/nv40_context.c
+++ b/src/gallium/drivers/nv40/nv40_context.c
@@ -40,7 +40,7 @@ nv40_destroy(struct pipe_context *pipe)
 
 	if (nv40->draw)
 		draw_destroy(nv40->draw);
-	free(nv40);
+	FREE(nv40);
 }
 
 struct pipe_context *
diff --git a/src/gallium/drivers/nv40/nv40_draw.c b/src/gallium/drivers/nv40/nv40_draw.c
index eb4f2395c4..7c5e0df5b8 100644
--- a/src/gallium/drivers/nv40/nv40_draw.c
+++ b/src/gallium/drivers/nv40/nv40_draw.c
@@ -158,7 +158,7 @@ nv40_render_reset_stipple_counter(struct draw_stage *draw)
 static void
 nv40_render_destroy(struct draw_stage *draw)
 {
-	free(draw);
+	FREE(draw);
 }
 
 static INLINE void
diff --git a/src/gallium/drivers/nv40/nv40_fragprog.c b/src/gallium/drivers/nv40/nv40_fragprog.c
index 33aac37d56..2d82f86ef5 100644
--- a/src/gallium/drivers/nv40/nv40_fragprog.c
+++ b/src/gallium/drivers/nv40/nv40_fragprog.c
@@ -801,7 +801,7 @@ nv40_fragprog_translate(struct nv40_context *nv40,
 	fp->translated = TRUE;
 out_err:
 	tgsi_parse_free(&parse);
-	free(fpc);
+	FREE(fpc);
 }
 
 static void
@@ -903,7 +903,7 @@ nv40_fragprog_destroy(struct nv40_context *nv40,
 		      struct nv40_fragment_program *fp)
 {
 	if (fp->insn_len)
-		free(fp->insn);
+		FREE(fp->insn);
 }
 
 struct nv40_state_entry nv40_state_fragprog = {
diff --git a/src/gallium/drivers/nv40/nv40_miptree.c b/src/gallium/drivers/nv40/nv40_miptree.c
index 01b3952fe6..215b91fcd0 100644
--- a/src/gallium/drivers/nv40/nv40_miptree.c
+++ b/src/gallium/drivers/nv40/nv40_miptree.c
@@ -72,7 +72,7 @@ nv40_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
 	mt->buffer = ws->buffer_create(ws, 256, PIPE_BUFFER_USAGE_PIXEL,
 				       mt->total_size);
 	if (!mt->buffer) {
-		free(mt);
+		FREE(mt);
 		return NULL;
 	}
 
@@ -93,9 +93,9 @@ nv40_miptree_release(struct pipe_screen *pscreen, struct pipe_texture **pt)
 		pipe_buffer_reference(ws, &nv40mt->buffer, NULL);
 		for (l = 0; l <= mt->last_level; l++) {
 			if (nv40mt->level[l].image_offset)
-				free(nv40mt->level[l].image_offset);
+				FREE(nv40mt->level[l].image_offset);
 		}
-		free(nv40mt);
+		FREE(nv40mt);
 	}
 }
 
diff --git a/src/gallium/drivers/nv40/nv40_query.c b/src/gallium/drivers/nv40/nv40_query.c
index 0317845624..a0a3072406 100644
--- a/src/gallium/drivers/nv40/nv40_query.c
+++ b/src/gallium/drivers/nv40/nv40_query.c
@@ -34,7 +34,7 @@ nv40_query_destroy(struct pipe_context *pipe, struct pipe_query *pq)
 
 	if (q->object)
 		nv40->nvws->res_free(&q->object);
-	free(q);
+	FREE(q);
 }
 
 static void
diff --git a/src/gallium/drivers/nv40/nv40_vertprog.c b/src/gallium/drivers/nv40/nv40_vertprog.c
index 9f1ee575ce..385c8aa078 100644
--- a/src/gallium/drivers/nv40/nv40_vertprog.c
+++ b/src/gallium/drivers/nv40/nv40_vertprog.c
@@ -572,7 +572,7 @@ nv40_vertprog_translate(struct nv40_context *nv40,
 	vpc->high_temp = -1;
 
 	if (!nv40_vertprog_prepare(vpc)) {
-		free(vpc);
+		FREE(vpc);
 		return;
 	}
 
@@ -628,7 +628,7 @@ nv40_vertprog_translate(struct nv40_context *nv40,
 	vp->translated = TRUE;
 out_err:
 	tgsi_parse_free(&parse);
-	free(vpc);
+	FREE(vpc);
 }
 
 static boolean
@@ -805,9 +805,9 @@ void
 nv40_vertprog_destroy(struct nv40_context *nv40, struct nv40_vertex_program *vp)
 {
 	if (vp->nr_consts)
-		free(vp->consts);
+		FREE(vp->consts);
 	if (vp->nr_insns)
-		free(vp->insns);
+		FREE(vp->insns);
 }
 
 struct nv40_state_entry nv40_state_vertprog = {