diff options
| author | Frederic Weisbecker <fweisbec@gmail.com> | 2009-09-23 17:08:43 -0400 |
|---|---|---|
| committer | Frederic Weisbecker <fweisbec@gmail.com> | 2009-09-23 17:08:43 -0400 |
| commit | d7a4b414eed51f1653bb05ebe84122bf9a7ae18b (patch) | |
| tree | bd6603a0c27de4c138a1767871897e9cd3e1a1d2 /kernel/kprobes.c | |
| parent | 1f0ab40976460bc4673fa204ce917a725185d8f2 (diff) | |
| parent | a724eada8c2a7b62463b73ccf73fd0bb6e928aeb (diff) | |
Merge commit 'linus/master' into tracing/kprobes
Conflicts:
kernel/trace/Makefile
kernel/trace/trace.h
kernel/trace/trace_event_types.h
kernel/trace/trace_export.c
Merge reason:
Sync with latest significant tracing core changes.
Diffstat (limited to 'kernel/kprobes.c')
| -rw-r--r-- | kernel/kprobes.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index b946761f84bd..b466afa4e148 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c | |||
| @@ -1349,7 +1349,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v) | |||
| 1349 | return 0; | 1349 | return 0; |
| 1350 | } | 1350 | } |
| 1351 | 1351 | ||
| 1352 | static struct seq_operations kprobes_seq_ops = { | 1352 | static const struct seq_operations kprobes_seq_ops = { |
| 1353 | .start = kprobe_seq_start, | 1353 | .start = kprobe_seq_start, |
| 1354 | .next = kprobe_seq_next, | 1354 | .next = kprobe_seq_next, |
| 1355 | .stop = kprobe_seq_stop, | 1355 | .stop = kprobe_seq_stop, |