Merge branch 'perf/urgent' into perf/core to fix conflicts

[~andy/linux] / tools / perf / util / machine.h

diff --git a/tools/perf/util/machine.h b/tools/perf/util/machine.h
index d44c09bdc45ea4a5bad2f8e000831d7073b6cb3a..4c1f5d567f542d7b65e22541a965c5e76d2b3ad4 100644 (file)
--- a/tools/perf/util/machine.h
+++ b/tools/perf/util/machine.h
@@ -92,7 +92,8 @@ int machine__resolve_callchain(struct machine *machine,
                               struct thread *thread,
                               struct perf_sample *sample,
                               struct symbol **parent,
-                              struct addr_location *root_al);
+                              struct addr_location *root_al,
+                              int max_stack);
 
 /*
  * Default guest kernel is defined by parameter --guestkallsyms