diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /kernel/trace/trace_kprobe.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'kernel/trace/trace_kprobe.c')
| -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 8435b43b1782..35d55a386145 100644 --- a/kernel/trace/trace_kprobe.c +++ b/kernel/trace/trace_kprobe.c | |||
| @@ -1839,7 +1839,7 @@ static void unregister_probe_event(struct trace_probe *tp) | |||
| 1839 | kfree(tp->call.print_fmt); | 1839 | kfree(tp->call.print_fmt); |
| 1840 | } | 1840 | } |
| 1841 | 1841 | ||
| 1842 | /* Make a debugfs interface for controling probe points */ | 1842 | /* Make a debugfs interface for controlling probe points */ |
| 1843 | static __init int init_kprobe_trace(void) | 1843 | static __init int init_kprobe_trace(void) |
| 1844 | { | 1844 | { |
| 1845 | struct dentry *d_tracer; | 1845 | struct dentry *d_tracer; |