diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-06-27 10:03:17 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-06-27 10:03:17 -0400 |
| commit | 4cf134e744ba46e5893f9600487c5f7f5eae0519 (patch) | |
| tree | 3cab8adaae68c884035c4d1f2b14adbb57b11d39 /tools/perf | |
| parent | 59913aabb06cb13f1bb09d4726a1a00d43d6cff2 (diff) | |
perf config: Use pr_warning()
warning() is going away, consolidating error reporting.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-5r3636cwl4z1varo90mervai@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/config.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/perf/util/config.c b/tools/perf/util/config.c index 8d724f0fa5a8..1498f38ea7ad 100644 --- a/tools/perf/util/config.c +++ b/tools/perf/util/config.c | |||
| @@ -657,8 +657,7 @@ static int perf_config_set__init(struct perf_config_set *set) | |||
| 657 | 657 | ||
| 658 | user_config = strdup(mkpath("%s/.perfconfig", home)); | 658 | user_config = strdup(mkpath("%s/.perfconfig", home)); |
| 659 | if (user_config == NULL) { | 659 | if (user_config == NULL) { |
| 660 | warning("Not enough memory to process %s/.perfconfig, " | 660 | pr_warning("Not enough memory to process %s/.perfconfig, ignoring it.", home); |
| 661 | "ignoring it.", home); | ||
| 662 | goto out; | 661 | goto out; |
| 663 | } | 662 | } |
| 664 | 663 | ||
| @@ -671,8 +670,7 @@ static int perf_config_set__init(struct perf_config_set *set) | |||
| 671 | ret = 0; | 670 | ret = 0; |
| 672 | 671 | ||
| 673 | if (st.st_uid && (st.st_uid != geteuid())) { | 672 | if (st.st_uid && (st.st_uid != geteuid())) { |
| 674 | warning("File %s not owned by current user or root, " | 673 | pr_warning("File %s not owned by current user or root, ignoring it.", user_config); |
| 675 | "ignoring it.", user_config); | ||
| 676 | goto out_free; | 674 | goto out_free; |
| 677 | } | 675 | } |
| 678 | 676 | ||
