Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 2ed152afc7ed61830b848b32936e1541a1a57799

Authored by Xiao Guangrong
Committed by Avi Kivity
1 parent 06056bfb94

KVM: cleanup kvm trace 

This patch does:

 - no need call tracepoint_synchronize_unregister() when kvm module
   is unloaded since ftrace can handle it

 - cleanup ftrace's macro

Signed-off-by: Xiao Guangrong <xiaoguangrong@cn.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>

Showing 6 changed files with 11 additions and 8 deletions Side-by-side Diff

... ... @@ -148,7 +148,6 @@
148 148  
149 149 #include <trace/events/kvm.h>
150 150  
151   -#undef TRACE_INCLUDE_FILE
152 151 #define CREATE_TRACE_POINTS
153 152 #include "mmutrace.h"
154 153  
arch/x86/kvm/mmutrace.h
Diff comments   View file @ 2ed152a
... ... @@ -6,8 +6,6 @@
6 6  
7 7 #undef TRACE_SYSTEM
8 8 #define TRACE_SYSTEM kvmmmu
9   -#define TRACE_INCLUDE_PATH .
10   -#define TRACE_INCLUDE_FILE mmutrace
11 9  
12 10 #define KVM_MMU_PAGE_FIELDS \
13 11 __field(__u64, gfn) \
... ... @@ -215,6 +213,11 @@
215 213 );
216 214  
217 215 #endif /* _TRACE_KVMMMU_H */
  216 +
  217 +#undef TRACE_INCLUDE_PATH
  218 +#define TRACE_INCLUDE_PATH .
  219 +#undef TRACE_INCLUDE_FILE
  220 +#define TRACE_INCLUDE_FILE mmutrace
218 221  
219 222 /* This part must be outside protection */
220 223 #include <trace/define_trace.h>
arch/x86/kvm/trace.h
Diff comments   View file @ 2ed152a
... ... @@ -5,8 +5,6 @@
5 5  
6 6 #undef TRACE_SYSTEM
7 7 #define TRACE_SYSTEM kvm
8   -#define TRACE_INCLUDE_PATH arch/x86/kvm
9   -#define TRACE_INCLUDE_FILE trace
10 8  
11 9 /*
12 10 * Tracepoint for guest mode entry.
... ... @@ -574,6 +572,11 @@
574 572 );
575 573  
576 574 #endif /* _TRACE_KVM_H */
  575 +
  576 +#undef TRACE_INCLUDE_PATH
  577 +#define TRACE_INCLUDE_PATH arch/x86/kvm
  578 +#undef TRACE_INCLUDE_FILE
  579 +#define TRACE_INCLUDE_FILE trace
577 580  
578 581 /* This part must be outside protection */
579 582 #include <trace/define_trace.h>
... ... @@ -41,7 +41,7 @@
41 41 #include <linux/srcu.h>
42 42 #include <linux/slab.h>
43 43 #include <trace/events/kvm.h>
44   -#undef TRACE_INCLUDE_FILE
  44 +
45 45 #define CREATE_TRACE_POINTS
46 46 #include "trace.h"
47 47  
include/trace/events/kvm.h
Diff comments   View file @ 2ed152a
... ... @@ -5,7 +5,6 @@
5 5  
6 6 #undef TRACE_SYSTEM
7 7 #define TRACE_SYSTEM kvm
8   -#define TRACE_INCLUDE_FILE kvm
9 8  
10 9 #if defined(__KVM_HAVE_IOAPIC)
11 10 TRACE_EVENT(kvm_set_irq,
... ... @@ -2279,7 +2279,6 @@
2279 2279  
2280 2280 void kvm_exit(void)
2281 2281 {
2282   - tracepoint_synchronize_unregister();
2283 2282 kvm_exit_debug();
2284 2283 misc_deregister(&kvm_dev);
2285 2284 kmem_cache_destroy(kvm_vcpu_cache);