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

[sfrench/cifs-2.6.git] / tools / perf / util / callchain.c

diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c
index 510b513e0f01fe96e110b9eab45db527b8c86104..a971caf3759dc2fc9645856c9296c3ad0aee1445 100644 (file)
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -65,8 +65,6 @@ static int parse_callchain_mode(const char *value)
                callchain_param.mode = CHAIN_FOLDED;
                return 0;
        }
-
-       pr_err("Invalid callchain mode: %s\n", value);
        return -1;
 }
 
@@ -82,8 +80,6 @@ static int parse_callchain_order(const char *value)
                callchain_param.order_set = true;
                return 0;
        }
-
-       pr_err("Invalid callchain order: %s\n", value);
        return -1;
 }
 
@@ -105,8 +101,6 @@ static int parse_callchain_sort_key(const char *value)
                callchain_param.branch_callstack = 1;
                return 0;
        }
-
-       pr_err("Invalid callchain sort key: %s\n", value);
        return -1;
 }
 
@@ -124,8 +118,6 @@ static int parse_callchain_value(const char *value)
                callchain_param.value = CCVAL_COUNT;
                return 0;
        }
-
-       pr_err("Invalid callchain config key: %s\n", value);
        return -1;
 }
 
@@ -319,12 +311,27 @@ int perf_callchain_config(const char *var, const char *value)
 
                return ret;
        }
-       if (!strcmp(var, "print-type"))
-               return parse_callchain_mode(value);
-       if (!strcmp(var, "order"))
-               return parse_callchain_order(value);
-       if (!strcmp(var, "sort-key"))
-               return parse_callchain_sort_key(value);
+       if (!strcmp(var, "print-type")){
+               int ret;
+               ret = parse_callchain_mode(value);
+               if (ret == -1)
+                       pr_err("Invalid callchain mode: %s\n", value);
+               return ret;
+       }
+       if (!strcmp(var, "order")){
+               int ret;
+               ret = parse_callchain_order(value);
+               if (ret == -1)
+                       pr_err("Invalid callchain order: %s\n", value);
+               return ret;
+       }
+       if (!strcmp(var, "sort-key")){
+               int ret;
+               ret = parse_callchain_sort_key(value);
+               if (ret == -1)
+                       pr_err("Invalid callchain sort key: %s\n", value);
+               return ret;
+       }
        if (!strcmp(var, "threshold")) {
                callchain_param.min_percent = strtod(value, &endptr);
                if (value == endptr) {
@@ -678,6 +685,8 @@ static enum match_result match_chain(struct callchain_cursor_node *node,
 {
        struct symbol *sym = node->sym;
        u64 left, right;
+       struct dso *left_dso = NULL;
+       struct dso *right_dso = NULL;
 
        if (callchain_param.key == CCKEY_SRCLINE) {
                enum match_result match = match_chain_srcline(node, cnode);
@@ -689,12 +698,14 @@ static enum match_result match_chain(struct callchain_cursor_node *node,
        if (cnode->ms.sym && sym && callchain_param.key == CCKEY_FUNCTION) {
                left = cnode->ms.sym->start;
                right = sym->start;
+               left_dso = cnode->ms.map->dso;
+               right_dso = node->map->dso;
        } else {
                left = cnode->ip;
                right = node->ip;
        }
 
-       if (left == right) {
+       if (left == right && left_dso == right_dso) {
                if (node->branch) {
                        cnode->branch_count++;