diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-01 11:24:26 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-01 11:24:26 +1000 |
| commit | 5f3e40ca0f60bfd5941a0e0c1c3c3a235f474dfe (patch) | |
| tree | 6f6e4b0a93a8fa7731ccf5cc375c77f918a1e295 /kernel | |
| parent | 970407cf5133fc6559af7041974edbf6ed4e2cc0 (diff) | |
| parent | 1458ce166c1b333ecbaf8caa9f4f54eab3a522a7 (diff) | |
Merge remote branch 'trivial/for-next'
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_kprobe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c index 8b27c9849b42..52f032306c7c 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c @@ -648,7 +648,7 @@ static int register_trace_probe(struct trace_probe *tp) } ret = register_probe_event(tp); if (ret) { - pr_warning("Faild to register probe event(%d)\n", ret); + pr_warning("Failed to register probe event(%d)\n", ret); goto end; } |