perf config: Use pr_warning()

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jul 1, 2017 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2017-07-01 08:49 UTC #0 lore raw

Commit-ID:  4cf134e744ba46e5893f9600487c5f7f5eae0519
Gitweb:     http://git.kernel.org/tip/4cf134e744ba46e5893f9600487c5f7f5eae0519
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 27 Jun 2017 11:03:17 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 27 Jun 2017 11:03:17 -0300

perf config: Use pr_warning()

warning() is going away, consolidating error reporting.

Cc Adrian Hunter <[email protected]>

Cc David Ahern <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Wang Nan <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/util/config.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

tools/perf/util/config.c +2 -4

index 8d724f0..1498f38 100644
@@ -657,8 +657,7 @@ static int perf_config_set__init(struct perf_config_set *set)
 
 	user_config = strdup(mkpath("%s/.perfconfig", home));
 	if (user_config == NULL) {
-		warning("Not enough memory to process %s/.perfconfig, "
-			"ignoring it.", home);
+		pr_warning("Not enough memory to process %s/.perfconfig, ignoring it.", home);
 		goto out;
 	}

@@ -671,8 +670,7 @@ static int perf_config_set__init(struct perf_config_set *set)
 	ret = 0;
 
 	if (st.st_uid && (st.st_uid != geteuid())) {
-		warning("File %s not owned by current user or root, "
-			"ignoring it.", user_config);
+		pr_warning("File %s not owned by current user or root, ignoring it.", user_config);
 		goto out_free;
 	}