diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-11-13 19:21:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-11-13 19:21:32 +0100 |
| commit | 84e53ff77cb1e005f49966cd6789109d84acc9e2 (patch) | |
| tree | 4d1426dc45c8af73e78279bd737eb1dd63909f11 /kernel/trace/trace_uprobe.c | |
| parent | ccf59d8da119ab03dcbdf95fb5e5adcef6ba51f2 (diff) | |
| parent | 7bcfaf54f591a0775254c4ea679faf615152ee3a (diff) | |
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core
Pull tracing updates from Steven Rostedt.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace/trace_uprobe.c')
| -rw-r--r-- | kernel/trace/trace_uprobe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c index 03003cd7dd96..4ff9ca4f359a 100644 --- a/kernel/trace/trace_uprobe.c +++ b/kernel/trace/trace_uprobe.c @@ -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; |