diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:53:05 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 03:53:05 -0500 |
commit | 3d7a96f5a485b7d06c2379f343d7312af89ec9e2 (patch) | |
tree | 5f097f68eb0f9fd3fa4a10f38672e300e9127b10 /virt/kvm/kvm_trace.c | |
parent | 723cbe0775514853c22dc45005af59c360916af1 (diff) | |
parent | 238c6d54830c624f34ac9cf123ac04aebfca5013 (diff) |
Merge branch 'linus' into tracing/kmemtrace2
Diffstat (limited to 'virt/kvm/kvm_trace.c')
-rw-r--r-- | virt/kvm/kvm_trace.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/virt/kvm/kvm_trace.c b/virt/kvm/kvm_trace.c index 41dcc845f78c..f59874446440 100644 --- a/virt/kvm/kvm_trace.c +++ b/virt/kvm/kvm_trace.c | |||
@@ -252,6 +252,7 @@ void kvm_trace_cleanup(void) | |||
252 | struct kvm_trace_probe *p = &kvm_trace_probes[i]; | 252 | struct kvm_trace_probe *p = &kvm_trace_probes[i]; |
253 | marker_probe_unregister(p->name, p->probe_func, p); | 253 | marker_probe_unregister(p->name, p->probe_func, p); |
254 | } | 254 | } |
255 | marker_synchronize_unregister(); | ||
255 | 256 | ||
256 | relay_close(kt->rchan); | 257 | relay_close(kt->rchan); |
257 | debugfs_remove(kt->lost_file); | 258 | debugfs_remove(kt->lost_file); |