diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-05-16 16:29:50 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-05-16 16:29:50 +0900 |
| commit | bd6356bdafc853201168f718f0059fbe11191461 (patch) | |
| tree | e2f82e8950b0201ab93c8fa8ff07ac31ba1c2a35 /drivers/gpu/drm/drm_mm.c | |
| parent | 3185847957d4834d1b30b253b1c71bb05bad7265 (diff) | |
| parent | 4b42120df72aeebd3967c952804cb1af53b91cc5 (diff) | |
| download | linux-bd6356bdafc853201168f718f0059fbe11191461.tar.bz2 | |
Merge branch 'dev/removing-s5p6442' into for-next
Diffstat (limited to 'drivers/gpu/drm/drm_mm.c')
| -rw-r--r-- | drivers/gpu/drm/drm_mm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c index 5d00b0fc0d91..959186cbf328 100644 --- a/drivers/gpu/drm/drm_mm.c +++ b/drivers/gpu/drm/drm_mm.c @@ -431,7 +431,7 @@ EXPORT_SYMBOL(drm_mm_search_free_in_range); void drm_mm_replace_node(struct drm_mm_node *old, struct drm_mm_node *new) { list_replace(&old->node_list, &new->node_list); - list_replace(&old->node_list, &new->hole_stack); + list_replace(&old->hole_stack, &new->hole_stack); new->hole_follows = old->hole_follows; new->mm = old->mm; new->start = old->start; @@ -699,8 +699,8 @@ int drm_mm_dump_table(struct seq_file *m, struct drm_mm *mm) entry->size); total_used += entry->size; if (entry->hole_follows) { - hole_start = drm_mm_hole_node_start(&mm->head_node); - hole_end = drm_mm_hole_node_end(&mm->head_node); + hole_start = drm_mm_hole_node_start(entry); + hole_end = drm_mm_hole_node_end(entry); hole_size = hole_end - hole_start; seq_printf(m, "0x%08lx-0x%08lx: 0x%08lx: free\n", hole_start, hole_end, hole_size); |