From: Rabin Vincent <rab...@axis.com>

Since 841e3558b2d ("perf callchain: Recording 'dwarf' callchains do not need
DWARF unwinding support"), --call-graph dwarf is allowed in perf record
even without unwind support.  A couple of other places don't reflect
this yet though: the help text should list dwarf as a valid record mode
and the dump_size config should be respected too.

Signed-off-by: Rabin Vincent <rab...@axis.com>
---
 tools/perf/util/callchain.c | 2 --
 tools/perf/util/callchain.h | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 07fd30b..ae58b49 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -193,7 +193,6 @@ int perf_callchain_config(const char *var, const char 
*value)
 
        if (!strcmp(var, "record-mode"))
                return parse_callchain_record_opt(value, &callchain_param);
-#ifdef HAVE_DWARF_UNWIND_SUPPORT
        if (!strcmp(var, "dump-size")) {
                unsigned long size = 0;
                int ret;
@@ -203,7 +202,6 @@ int perf_callchain_config(const char *var, const char 
*value)
 
                return ret;
        }
-#endif
        if (!strcmp(var, "print-type"))
                return parse_callchain_mode(value);
        if (!strcmp(var, "order"))
diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h
index 13e7554..47cfd10 100644
--- a/tools/perf/util/callchain.h
+++ b/tools/perf/util/callchain.h
@@ -11,11 +11,7 @@
 
 #define CALLCHAIN_HELP "setup and enables call-graph (stack 
chain/backtrace):\n\n"
 
-#ifdef HAVE_DWARF_UNWIND_SUPPORT
 # define RECORD_MODE_HELP  HELP_PAD "record_mode:\tcall graph recording mode 
(fp|dwarf|lbr)\n"
-#else
-# define RECORD_MODE_HELP  HELP_PAD "record_mode:\tcall graph recording mode 
(fp|lbr)\n"
-#endif
 
 #define RECORD_SIZE_HELP                                               \
        HELP_PAD "record_size:\tif record_mode is 'dwarf', max size of stack 
recording (<bytes>)\n" \
-- 
2.1.4

Reply via email to