From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kai Huang Subject: [PATCH] KVM: trace: fix trace_kvm_pml_full build error on i386 Date: Fri, 30 Jan 2015 11:04:52 +0800 Message-ID: <1422587092-10125-1-git-send-email-kai.huang@linux.intel.com> Cc: Kai Huang To: pbonzini@redhat.com, fengguang.wu@intel.com, kvm@vger.kernel.org Return-path: Received: from mga14.intel.com ([192.55.52.115]:59671 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752358AbbA3DNQ (ORCPT ); Thu, 29 Jan 2015 22:13:16 -0500 Sender: kvm-owner@vger.kernel.org List-ID: Fix trace_kvm_pml_full build error on i386, introduced by below commit: commit 19cf3eb32410 ("KVM: VMX: Add PML support in VMX") In above commit trace_kvm_pml_full was only defined in CONFIG_X86_64, which breaks build on i386. Fix it by moving trace_kvm_pml_full definition out of CONFIG_X86_64. Tested with Fengguang's .config, and also did sanity test on x86_64. Signed-off-by: Kai Huang --- arch/x86/kvm/trace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h index a139977..7c7bc8b 100644 --- a/arch/x86/kvm/trace.h +++ b/arch/x86/kvm/trace.h @@ -846,6 +846,8 @@ TRACE_EVENT(kvm_track_tsc, __print_symbolic(__entry->host_clock, host_clocks)) ); +#endif /* CONFIG_X86_64 */ + /* * Tracepoint for PML full VMEXIT. */ @@ -864,8 +866,6 @@ TRACE_EVENT(kvm_pml_full, TP_printk("vcpu %d: PML full", __entry->vcpu_id) ); -#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), -- 2.1.0