summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-08-25 16:08:21 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2014-08-25 16:08:21 +0200
commit54ad89b05ec49b90790de814647b244d3d2cc5ca (patch)
tree92b5278e7ba4b475223c2a9bf984dc280a599e2d
parentMerge tag 'kvm-s390-20140825' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadlinux-54ad89b05ec49b90790de814647b244d3d2cc5ca.tar.xz
linux-54ad89b05ec49b90790de814647b244d3d2cc5ca.zip
kvm: x86: fix tracing for 32-bit
Fix commit 7b46268d29543e313e731606d845e65c17f232e4, which mistakenly included the new tracepoint under #ifdef CONFIG_X86_64. Reported-by: Sabrina Dubroca <sd@queasysnail.net> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--arch/x86/kvm/trace.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h
index 1742dfbd26b3..4c2868f36808 100644
--- a/arch/x86/kvm/trace.h
+++ b/arch/x86/kvm/trace.h
@@ -848,6 +848,8 @@ TRACE_EVENT(kvm_track_tsc,
__print_symbolic(__entry->host_clock, host_clocks))
);
+#endif /* CONFIG_X86_64 */
+
TRACE_EVENT(kvm_ple_window,
TP_PROTO(bool grow, unsigned int vcpu_id, int new, int old),
TP_ARGS(grow, vcpu_id, new, old),
@@ -878,8 +880,6 @@ TRACE_EVENT(kvm_ple_window,
#define trace_kvm_ple_window_shrink(vcpu_id, new, old) \
trace_kvm_ple_window(false, vcpu_id, new, old)
-#endif /* CONFIG_X86_64 */
-
#endif /* _TRACE_KVM_H */
#undef TRACE_INCLUDE_PATH