Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg...

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

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index 03003cd..9614db8 100644 (file)
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -189,7 +189,7 @@ static int create_trace_uprobe(int argc, char **argv)
        if (argv[0][0] == '-')
                is_delete = true;
        else if (argv[0][0] != 'p') {
-               pr_info("Probe definition must be started with 'p', 'r' or" " '-'.\n");
+               pr_info("Probe definition must be started with 'p' or '-'.\n");
                return -EINVAL;
        }
 
@@ -252,7 +252,7 @@ static int create_trace_uprobe(int argc, char **argv)
        if (ret)
                goto fail_address_parse;
 
-       ret = strict_strtoul(arg, 0, &offset);
+       ret = kstrtoul(arg, 0, &offset);
        if (ret)
                goto fail_address_parse;