Merge tag 'trace-v6.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux...

[sfrench/cifs-2.6.git] / tools / perf / util / parse-regs-options.c

diff --git a/tools/perf/util/parse-regs-options.c b/tools/perf/util/parse-regs-options.c
index a4a100425b3a29bcb11765e833d9fb9e2d66da38..cda1c620968e514d1c9f9a889370fef5b22c00db 100644 (file)
--- a/tools/perf/util/parse-regs-options.c
+++ b/tools/perf/util/parse-regs-options.c
@@ -46,22 +46,18 @@ __parse_regs(const struct option *opt, const char *str, int unset, bool intr)
 
                        if (!strcmp(s, "?")) {
                                fprintf(stderr, "available registers: ");
-#ifdef HAVE_PERF_REGS_SUPPORT
-                               for (r = sample_reg_masks; r->name; r++) {
+                               for (r = arch__sample_reg_masks(); r->name; r++) {
                                        if (r->mask & mask)
                                                fprintf(stderr, "%s ", r->name);
                                }
-#endif
                                fputc('\n', stderr);
                                /* just printing available regs */
                                goto error;
                        }
-#ifdef HAVE_PERF_REGS_SUPPORT
-                       for (r = sample_reg_masks; r->name; r++) {
+                       for (r = arch__sample_reg_masks(); r->name; r++) {
                                if ((r->mask & mask) && !strcasecmp(s, r->name))
                                        break;
                        }
-#endif
                        if (!r || !r->name) {
                                ui__warning("Unknown register \"%s\", check man page or run \"perf record %s?\"\n",
                                            s, intr ? "-I" : "--user-regs=");