diff options
Diffstat (limited to 'tools/perf/builtin-report.c')
-rw-r--r-- | tools/perf/builtin-report.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index d0180d5de781..f4d640cfdf16 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c | |||
@@ -805,30 +805,12 @@ repeat: | |||
805 | if (branch_mode == -1 && has_br_stack) | 805 | if (branch_mode == -1 && has_br_stack) |
806 | sort__mode = SORT_MODE__BRANCH; | 806 | sort__mode = SORT_MODE__BRANCH; |
807 | 807 | ||
808 | /* sort__mode could be NORMAL if --no-branch-stack */ | ||
809 | if (sort__mode == SORT_MODE__BRANCH) { | ||
810 | /* | ||
811 | * if no sort_order is provided, then specify | ||
812 | * branch-mode specific order | ||
813 | */ | ||
814 | if (sort_order == default_sort_order) | ||
815 | sort_order = "comm,dso_from,symbol_from," | ||
816 | "dso_to,symbol_to"; | ||
817 | |||
818 | } | ||
819 | if (report.mem_mode) { | 808 | if (report.mem_mode) { |
820 | if (sort__mode == SORT_MODE__BRANCH) { | 809 | if (sort__mode == SORT_MODE__BRANCH) { |
821 | pr_err("branch and mem mode incompatible\n"); | 810 | pr_err("branch and mem mode incompatible\n"); |
822 | goto error; | 811 | goto error; |
823 | } | 812 | } |
824 | sort__mode = SORT_MODE__MEMORY; | 813 | sort__mode = SORT_MODE__MEMORY; |
825 | |||
826 | /* | ||
827 | * if no sort_order is provided, then specify | ||
828 | * branch-mode specific order | ||
829 | */ | ||
830 | if (sort_order == default_sort_order) | ||
831 | sort_order = "local_weight,mem,sym,dso,symbol_daddr,dso_daddr,snoop,tlb,locked"; | ||
832 | } | 814 | } |
833 | 815 | ||
834 | if (setup_sorting() < 0) { | 816 | if (setup_sorting() < 0) { |