diff options
author | Joe Perches <joe@perches.com> | 2016-03-22 17:28:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-22 18:36:02 -0400 |
commit | a395d6a7e3d6e3d1d316376db0c4c8b5d2995930 (patch) | |
tree | c6c980f8b63fb4159f116b498759984b2a7767a0 /kernel/trace/trace_functions_graph.c | |
parent | 20d7a35bc8be06dd1350de0454b0e24cca1d4354 (diff) |
kernel/...: convert pr_warning to pr_warn
Use the more common logging method with the eventual goal of removing
pr_warning altogether.
Miscellanea:
- Realign arguments
- Coalesce formats
- Add missing space between a few coalesced formats
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> [kernel/power/suspend.c]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/trace/trace_functions_graph.c')
-rw-r--r-- | kernel/trace/trace_functions_graph.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c index a663cbb84107..91d6a63a2ea7 100644 --- a/kernel/trace/trace_functions_graph.c +++ b/kernel/trace/trace_functions_graph.c | |||
@@ -1350,7 +1350,7 @@ void graph_trace_open(struct trace_iterator *iter) | |||
1350 | out_err_free: | 1350 | out_err_free: |
1351 | kfree(data); | 1351 | kfree(data); |
1352 | out_err: | 1352 | out_err: |
1353 | pr_warning("function graph tracer: not enough memory\n"); | 1353 | pr_warn("function graph tracer: not enough memory\n"); |
1354 | } | 1354 | } |
1355 | 1355 | ||
1356 | void graph_trace_close(struct trace_iterator *iter) | 1356 | void graph_trace_close(struct trace_iterator *iter) |
@@ -1468,12 +1468,12 @@ static __init int init_graph_trace(void) | |||
1468 | max_bytes_for_cpu = snprintf(NULL, 0, "%d", nr_cpu_ids - 1); | 1468 | max_bytes_for_cpu = snprintf(NULL, 0, "%d", nr_cpu_ids - 1); |
1469 | 1469 | ||
1470 | if (!register_trace_event(&graph_trace_entry_event)) { | 1470 | if (!register_trace_event(&graph_trace_entry_event)) { |
1471 | pr_warning("Warning: could not register graph trace events\n"); | 1471 | pr_warn("Warning: could not register graph trace events\n"); |
1472 | return 1; | 1472 | return 1; |
1473 | } | 1473 | } |
1474 | 1474 | ||
1475 | if (!register_trace_event(&graph_trace_ret_event)) { | 1475 | if (!register_trace_event(&graph_trace_ret_event)) { |
1476 | pr_warning("Warning: could not register graph trace events\n"); | 1476 | pr_warn("Warning: could not register graph trace events\n"); |
1477 | return 1; | 1477 | return 1; |
1478 | } | 1478 | } |
1479 | 1479 | ||