dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'linus/master' into tracing/kprobes

Browse Source 
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.
This commit is contained in:
Frederic Weisbecker
2009-09-23 23:08:43 +02:00
parent 1f0ab40976 a724eada8c
commit d7a4b414ee
8267 changed files with 928292 additions and 467293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/kprobes.c
+1 -1
View File
@@ -1349,7 +1349,7 @@ static int __kprobes show_kprobe_addr(struct seq_file *pi, void *v)
return 0;
}
static struct seq_operations kprobes_seq_ops = {
static const struct seq_operations kprobes_seq_ops = {
.start = kprobe_seq_start,
.next = kprobe_seq_next,
.stop = kprobe_seq_stop,