* [patch] nouveau: free the memory in nouveau_gart_manager_del()
@ 2011-06-25 5:53 Dan Carpenter
2011-06-25 12:01 ` Ben Skeggs
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2011-06-25 5:53 UTC (permalink / raw)
To: Ben Skeggs; +Cc: kernel-janitors, Roy Spliet, open list:DRM DRIVERS
In the original code the kfree() doesn't do anything because
"mem->mm_node" has been set to NULL. This was introduced in
d2f96666c56a "drm/nouveau: create temp vmas for both src and dst of
bo moves"
Signed-off-by: Dan Carpenter <error27@gmail.com>
diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
index 765f0e5..ab79bf8 100644
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
@@ -846,8 +846,8 @@ nouveau_gart_manager_del(struct ttm_mem_type_manager *man,
struct ttm_mem_reg *mem)
{
nouveau_mem_node_cleanup(mem->mm_node);
- mem->mm_node = NULL;
kfree(mem->mm_node);
+ mem->mm_node = NULL;
}
static int
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [patch] nouveau: free the memory in nouveau_gart_manager_del()
2011-06-25 5:53 [patch] nouveau: free the memory in nouveau_gart_manager_del() Dan Carpenter
@ 2011-06-25 12:01 ` Ben Skeggs
0 siblings, 0 replies; 2+ messages in thread
From: Ben Skeggs @ 2011-06-25 12:01 UTC (permalink / raw)
To: Dan Carpenter; +Cc: kernel-janitors, Roy Spliet, open list:DRM DRIVERS
On Sat, 2011-06-25 at 08:53 +0300, Dan Carpenter wrote:
> In the original code the kfree() doesn't do anything because
> "mem->mm_node" has been set to NULL. This was introduced in
> d2f96666c56a "drm/nouveau: create temp vmas for both src and dst of
> bo moves"
Already fixed in nouveau git, I'll get the fixes to Dave.
Ben.
>
> Signed-off-by: Dan Carpenter <error27@gmail.com>
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_mem.c b/drivers/gpu/drm/nouveau/nouveau_mem.c
> index 765f0e5..ab79bf8 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_mem.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
> @@ -846,8 +846,8 @@ nouveau_gart_manager_del(struct ttm_mem_type_manager *man,
> struct ttm_mem_reg *mem)
> {
> nouveau_mem_node_cleanup(mem->mm_node);
> - mem->mm_node = NULL;
> kfree(mem->mm_node);
> + mem->mm_node = NULL;
> }
>
> static int
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-25 11:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-25 5:53 [patch] nouveau: free the memory in nouveau_gart_manager_del() Dan Carpenter
2011-06-25 12:01 ` Ben Skeggs
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox