Merge tag 'amd64-edac-updates-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / tools / perf / builtin-probe.c

diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index fb8566181f27f2ef4dace5ba93fd273c6cae4f51..4935c09dd5b58f402a6373c234042e449f58f71a 100644 (file)
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -58,7 +58,7 @@ static struct {
        struct perf_probe_event events[MAX_PROBES];
        struct strlist *dellist;
        struct line_range line_range;
-       const char *target_module;
+       const char *target;
        int max_probe_points;
        struct strfilter *filter;
 } params;
@@ -246,7 +246,7 @@ static const struct option options[] = {
                   "file", "vmlinux pathname"),
        OPT_STRING('s', "source", &symbol_conf.source_prefix,
                   "directory", "path to kernel source"),
-       OPT_STRING('m', "module", &params.target_module,
+       OPT_STRING('m', "module", &params.target,
                   "modname|path",
                   "target module name (for online) or path (for offline)"),
 #endif
@@ -333,7 +333,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
                if (!params.filter)
                        params.filter = strfilter__new(DEFAULT_FUNC_FILTER,
                                                       NULL);
-               ret = show_available_funcs(params.target_module,
+               ret = show_available_funcs(params.target,
                                           params.filter);
                strfilter__delete(params.filter);
                if (ret < 0)
@@ -354,7 +354,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
                        usage_with_options(probe_usage, options);
                }
 
-               ret = show_line_range(&params.line_range, params.target_module);
+               ret = show_line_range(&params.line_range, params.target);
                if (ret < 0)
                        pr_err("  Error: Failed to show lines. (%d)\n", ret);
                return ret;
@@ -371,7 +371,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
 
                ret = show_available_vars(params.events, params.nevents,
                                          params.max_probe_points,
-                                         params.target_module,
+                                         params.target,
                                          params.filter,
                                          params.show_ext_vars);
                strfilter__delete(params.filter);
@@ -393,7 +393,7 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
        if (params.nevents) {
                ret = add_perf_probe_events(params.events, params.nevents,
                                            params.max_probe_points,
-                                           params.target_module,
+                                           params.target,
                                            params.force_add);
                if (ret < 0) {
                        pr_err("  Error: Failed to add events. (%d)\n", ret);