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

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

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index a017a42..20c4434 100644 (file)
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -60,31 +60,20 @@
 static noinline depot_stack_handle_t __save_depot_stack(void)
 {
        unsigned long entries[STACKDEPTH];
-       struct stack_trace trace = {
-               .entries = entries,
-               .max_entries = ARRAY_SIZE(entries),
-               .skip = 1,
-       };
+       unsigned int n;
 
-       save_stack_trace(&trace);
-       if (trace.nr_entries &&
-           trace.entries[trace.nr_entries - 1] == ULONG_MAX)
-               trace.nr_entries--;
-
-       return depot_save_stack(&trace, GFP_NOWAIT | __GFP_NOWARN);
+       n = stack_trace_save(entries, ARRAY_SIZE(entries), 1);
+       return stack_depot_save(entries, n, GFP_NOWAIT | __GFP_NOWARN);
 }
 
 static void __print_depot_stack(depot_stack_handle_t stack,
                                char *buf, int sz, int indent)
 {
-       unsigned long entries[STACKDEPTH];
-       struct stack_trace trace = {
-               .entries = entries,
-               .max_entries = ARRAY_SIZE(entries),
-       };
+       unsigned long *entries;
+       unsigned int nr_entries;
 
-       depot_fetch_stack(stack, &trace);
-       snprint_stack_trace(buf, sz, &trace, indent);
+       nr_entries = stack_depot_fetch(stack, &entries);
+       stack_trace_snprint(buf, sz, entries, nr_entries, indent);
 }
 
 static void init_intel_runtime_pm_wakeref(struct drm_i915_private *i915)