Merge remote-tracking branch 'torvalds/master' into perf/core
[platform/kernel/linux-starfive.git] / tools / perf / tests / pmu-events.c
index f7b9dbb..e36d8b1 100644 (file)
@@ -987,10 +987,10 @@ static int metric_parse_fake(const char *str)
         */
        i = 1;
        hashmap__for_each_entry(ctx->ids, cur, bkt)
-               expr__add_id_val(ctx, strdup(cur->key), i++);
+               expr__add_id_val(ctx, strdup(cur->pkey), i++);
 
        hashmap__for_each_entry(ctx->ids, cur, bkt) {
-               if (check_parse_fake(cur->key)) {
+               if (check_parse_fake(cur->pkey)) {
                        pr_err("check_parse_fake failed\n");
                        goto out;
                }
@@ -1004,7 +1004,7 @@ static int metric_parse_fake(const char *str)
                 */
                i = 1024;
                hashmap__for_each_entry(ctx->ids, cur, bkt)
-                       expr__add_id_val(ctx, strdup(cur->key), i--);
+                       expr__add_id_val(ctx, strdup(cur->pkey), i--);
                if (expr__parse(&result, ctx, str)) {
                        pr_err("expr__parse failed\n");
                        ret = -1;