Merge tag 'upstream-4.6-rc1' of git://git.infradead.org/linux-ubifs

[cascardo/linux.git] / kernel / trace / trace_uprobe.c

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index d2f6d0b..7915142 100644 (file)
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -334,7 +334,7 @@ static int register_trace_uprobe(struct trace_uprobe *tu)
 
        ret = register_uprobe_event(tu);
        if (ret) {
-               pr_warning("Failed to register probe event(%d)\n", ret);
+               pr_warn("Failed to register probe event(%d)\n", ret);
                goto end;
        }