diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-12-08 15:50:23 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-12-08 15:51:10 +0100 |
| commit | 7e0dd574cd6b1bcc818ed4251e5ceda7d8bee08f (patch) | |
| tree | 04f5630e361083ab53da43a46d6c47a52e8b87ca /kernel/trace | |
| parent | f0b9abfb044649bc452fb2fb975ff2fd599cc6a3 (diff) | |
| parent | 32cdba1e05418909708a17e52505e8b2ba4381d1 (diff) | |
Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc into perf/core
Pull uprobes fixes, cleanups and preparation for the ARM port from Oleg Nesterov.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/trace')
| -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 4ff9ca4f359..9614db8b0f8 100644 --- 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; } |