diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-05-21 17:53:06 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-05-21 17:53:46 +0200 |
commit | f80836c86ebd44bf8f90882283a1618e09dfaed2 (patch) | |
tree | be28455ff20df71fcebc3e59b2575721ab099ba3 /samples/tracepoints/tracepoint-probe-sample2.c | |
parent | 598357eba6a55d27ddc7ead80ebb83fe1aad9b83 (diff) | |
parent | ff5f149b6aec8edbfa3698721667acd043009a33 (diff) | |
download | op-kernel-dev-f80836c86ebd44bf8f90882283a1618e09dfaed2.zip op-kernel-dev-f80836c86ebd44bf8f90882283a1618e09dfaed2.tar.gz |
Merge branch 'tip/tracing/core-7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
Diffstat (limited to 'samples/tracepoints/tracepoint-probe-sample2.c')
-rw-r--r-- | samples/tracepoints/tracepoint-probe-sample2.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/samples/tracepoints/tracepoint-probe-sample2.c b/samples/tracepoints/tracepoint-probe-sample2.c index be2a960..9fcf990 100644 --- a/samples/tracepoints/tracepoint-probe-sample2.c +++ b/samples/tracepoints/tracepoint-probe-sample2.c @@ -12,7 +12,8 @@ * Here the caller only guarantees locking for struct file and struct inode. * Locking must therefore be done in the probe to use the dentry. */ -static void probe_subsys_event(struct inode *inode, struct file *file) +static void probe_subsys_event(void *ignore, + struct inode *inode, struct file *file) { printk(KERN_INFO "Event is encountered with inode number %lu\n", inode->i_ino); @@ -22,7 +23,7 @@ static int __init tp_sample_trace_init(void) { int ret; - ret = register_trace_subsys_event(probe_subsys_event); + ret = register_trace_subsys_event(probe_subsys_event, NULL); WARN_ON(ret); return 0; @@ -32,7 +33,7 @@ module_init(tp_sample_trace_init); static void __exit tp_sample_trace_exit(void) { - unregister_trace_subsys_event(probe_subsys_event); + unregister_trace_subsys_event(probe_subsys_event, NULL); tracepoint_synchronize_unregister(); } |