From patchwork Fri Jan 30 03:04:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai Huang X-Patchwork-Id: 5746501 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1148E9F358 for ; Fri, 30 Jan 2015 03:13:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5604D2021A for ; Fri, 30 Jan 2015 03:13:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B22B20218 for ; Fri, 30 Jan 2015 03:13:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753507AbbA3DNQ (ORCPT ); Thu, 29 Jan 2015 22:13:16 -0500 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 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP; 29 Jan 2015 19:06:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,490,1418112000"; d="scan'208";a="670074952" Received: from kai-desktop.bj.intel.com ([10.238.135.63]) by fmsmga002.fm.intel.com with ESMTP; 29 Jan 2015 19:13:13 -0800 From: Kai Huang To: pbonzini@redhat.com, fengguang.wu@intel.com, kvm@vger.kernel.org Cc: 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> X-Mailer: git-send-email 2.1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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),