Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / gpu / drm / drm_mm.c

diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c
index 2b4f373..8b4cd31 100644 (file)
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
@@ -106,25 +106,19 @@
 static noinline void save_stack(struct drm_mm_node *node)
 {
        unsigned long entries[STACKDEPTH];
-       struct stack_trace trace = {
-               .entries = entries,
-               .max_entries = STACKDEPTH,
-               .skip = 1
-       };
+       unsigned int n;
 
-       save_stack_trace(&trace);
-       if (trace.nr_entries != 0 &&
-           trace.entries[trace.nr_entries-1] == ULONG_MAX)
-               trace.nr_entries--;
+       n = stack_trace_save(entries, ARRAY_SIZE(entries), 1);
 
        /* May be called under spinlock, so avoid sleeping */
-       node->stack = depot_save_stack(&trace, GFP_NOWAIT);
+       node->stack = stack_depot_save(entries, n, GFP_NOWAIT);
 }
 
 static void show_leaks(struct drm_mm *mm)
 {
        struct drm_mm_node *node;
-       unsigned long entries[STACKDEPTH];
+       unsigned long *entries;
+       unsigned int nr_entries;
        char *buf;
 
        buf = kmalloc(BUFSZ, GFP_KERNEL);
@@ -132,19 +126,14 @@ static void show_leaks(struct drm_mm *mm)
                return;
 
        list_for_each_entry(node, drm_mm_nodes(mm), node_list) {
-               struct stack_trace trace = {
-                       .entries = entries,
-                       .max_entries = STACKDEPTH
-               };
-
                if (!node->stack) {
                        DRM_ERROR("node [%08llx + %08llx]: unknown owner\n",
                                  node->start, node->size);
                        continue;
                }
 
-               depot_fetch_stack(node->stack, &trace);
-               snprint_stack_trace(buf, BUFSZ, &trace, 0);
+               nr_entries = stack_depot_fetch(node->stack, &entries);
+               stack_trace_snprint(buf, BUFSZ, entries, nr_entries, 0);
                DRM_ERROR("node [%08llx + %08llx]: inserted at\n%s",
                          node->start, node->size, buf);
        }