From patchwork Thu May 18 09:47:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 9733087 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C8BFC601A1 for ; Thu, 18 May 2017 09:48:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B22B4285F9 for ; Thu, 18 May 2017 09:48:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A659528678; Thu, 18 May 2017 09:48:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 31691285F9 for ; Thu, 18 May 2017 09:48:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=oW4xaEeQWiYRb49gWWHIbPevd07wBazadq7ZKjXaOfc=; b=mU/4OgEVjukrkaN0Uej/hNMHcl SCR3mrLQd/X++ayavQpdtBhyW8wjAa1qWCwHwaOSxsrX0r5aRb5FN1MEZcnjAosbwUpZV/+lJbs+S AQMv6BDwDctMT+apREuqNBC+kQD99qEioVRF5Mrm6Zepu57g3Jm6Nv/l1lpqYIZrgIDB5mczVnYxA gBZ2S4xX33H7S2jM20jttWYHDQXXzU8JUYaINzeYYXFqHsodm+eBtG/4RtX0YlVKVcH/b78BnJiph UgkeUyvGdk0GMkZ6by5j1qnE7lGiXM/UciJpF9lcY097raokKaACDDfTHiL4PsAWHhNOACf7FQgqS EFfaB/7w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dBI2d-0005lt-FO; Thu, 18 May 2017 09:48:19 +0000 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dBI2J-0005KR-E1 for linux-arm-kernel@lists.infradead.org; Thu, 18 May 2017 09:48:01 +0000 Received: by mail-wm0-x22b.google.com with SMTP id v15so45992626wmv.1 for ; Thu, 18 May 2017 02:47:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=WORkw/h6nsu4OR0bTHWmfEZ03ZfLtuWkN9mPXYWI7MI=; b=b/j75ipJBoY64Suv+zQsRf7dFks0bI1OZpuNnowLc+B1cxQXyWDJbDKFkg6A5H9CzJ FNJZDl81zGHzZNGiL/p7Q+hfHDWYvVl1iBGClHqYjbno23W6L9x4cXh9uqmDM/K6Ic/8 yXp+QkbIN9KW0mSFtyP5/cOfx34q2evDt5eq4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=WORkw/h6nsu4OR0bTHWmfEZ03ZfLtuWkN9mPXYWI7MI=; b=s1x6lirs1Lys9LY7835Kz8EpT1ZRjcNHXDLih+DfETUc03z3Podm0QUnPeIx6mcieh y77/1XSBloU4qSNeNSt3d8ik+8fiVkEn2vUR4IA9bU5mrl+7H4yKq7MEQphCvLmh16Pv k6w7h57ki9hB81gRWLh0QPVHn6H7zXbjHtB72YcOCpnp1WCe7whateL7wrNg4UmV+iUb bHcCcZ9rodK6P3Y/T5v8P++5DG+5+0/qPPsDkafTb113z3POpIRLXWUuURJy7AlSZT+D VbzWCG/T2m0J5t4/FuvWNvNF2WVXBNgK+7hOLPm2VYOftMeo8Gmjo1MHvDa20D6noKdY abZg== X-Gm-Message-State: AODbwcCp7Bu9yDnoeguWPeYFC1H1+lMa/IJUSITO/Xm6VHvZUN3fi7I9 wPqlioVVyiFKNQMi X-Received: by 10.80.187.68 with SMTP id y62mr2590980ede.51.1495100857939; Thu, 18 May 2017 02:47:37 -0700 (PDT) Received: from localhost.localdomain (xd93ddc2d.cust.hiper.dk. [217.61.220.45]) by smtp.gmail.com with ESMTPSA id w15sm2377437edw.27.2017.05.18.02.47.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 May 2017 02:47:37 -0700 (PDT) From: Christoffer Dall To: Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= Subject: [PULL 01/13] ARM: KVM: Fix tracepoint generation after move to virt/kvm/arm/ Date: Thu, 18 May 2017 11:47:10 +0200 Message-Id: <20170518094722.9926-2-cdall@linaro.org> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170518094722.9926-1-cdall@linaro.org> References: <20170518094722.9926-1-cdall@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170518_024759_630187_4F04E643 X-CRM114-Status: GOOD ( 11.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marc Zyngier , Christoffer Dall , kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marc Zyngier Moving most of the shared code to virt/kvm/arm had for consequence that KVM/ARM doesn't build anymore, because the code that used to define the tracepoints is now somewhere else. Fix this by defining CREATE_TRACE_POINTS in coproc.c, and clean-up trace.h as well. Fixes: 35d2d5d490e2 ("KVM: arm/arm64: Move shared files to virt/kvm/arm") Reported-by: Arnd Bergmann Signed-off-by: Marc Zyngier Signed-off-by: Christoffer Dall --- arch/arm/kvm/coproc.c | 1 + arch/arm/kvm/trace.h | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c index 2c14b69..ac8d36d 100644 --- a/arch/arm/kvm/coproc.c +++ b/arch/arm/kvm/coproc.c @@ -32,6 +32,7 @@ #include #include "../vfp/vfpinstr.h" +#define CREATE_TRACE_POINTS #include "trace.h" #include "coproc.h" diff --git a/arch/arm/kvm/trace.h b/arch/arm/kvm/trace.h index fc09437..b0d1064 100644 --- a/arch/arm/kvm/trace.h +++ b/arch/arm/kvm/trace.h @@ -1,5 +1,5 @@ -#if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ) -#define _TRACE_KVM_H +#if !defined(_TRACE_ARM_KVM_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_ARM_KVM_H #include @@ -74,10 +74,10 @@ TRACE_EVENT(kvm_hvc, __entry->vcpu_pc, __entry->r0, __entry->imm) ); -#endif /* _TRACE_KVM_H */ +#endif /* _TRACE_ARM_KVM_H */ #undef TRACE_INCLUDE_PATH -#define TRACE_INCLUDE_PATH arch/arm/kvm +#define TRACE_INCLUDE_PATH . #undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_FILE trace