From patchwork Tue Aug 5 10:35:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 376648 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 24E6A1400BB for ; Tue, 5 Aug 2014 20:36:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752530AbaHEKgK (ORCPT ); Tue, 5 Aug 2014 06:36:10 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:39753 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752522AbaHEKgJ (ORCPT ); Tue, 5 Aug 2014 06:36:09 -0400 Received: by mail-wg0-f42.google.com with SMTP id l18so771991wgh.1 for ; Tue, 05 Aug 2014 03:36:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=i+dK8OX4N2/Lxb77Sm8p3LXH9P2o5b3+TvarSvDWEwQ=; b=QakwusYvJeDb98q2JHofYHyaEV0OL7GSP0g+9SFhy8nZFT+Wd/b6kfFTb9mO1WQKgN dz6HFhuIz6Rq9bmCKuFTLEkq0sKwOYpBli7duOQ5CZDe3RkUJbbkSrFZrBXajxEPq2h4 yjsmY8eAdqAe0W9uJYrQC4ffjLHwfAmWtOgrRkuHBk3tisjqvrpzZvaMjb3/DdyLyh7M eB1ZslTPDWTNhXo2jzigCyzktfUP1tFzQSc9S43GCb2EuNvyNsc+VtimWhKAyc8Y50Nl O0SW72bxoCqryvGtGoa3k1CDR2zYwuail2cSm7aWd3MAdG+C5+lsQ64rH8E2wmzJsXdJ ulwg== X-Received: by 10.194.134.70 with SMTP id pi6mr4530165wjb.1.1407234967288; Tue, 05 Aug 2014 03:36:07 -0700 (PDT) Received: from playground.station (net-37-116-196-153.cust.vodafonedsl.it. [37.116.196.153]) by mx.google.com with ESMTPSA id ft7sm6369241wib.9.2014.08.05.03.36.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 Aug 2014 03:36:06 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org Cc: agraf@suse.de, kvm@vger.kernel.org, linux-next@vger.kernel.org, kvm-ppc@vger.kernel.org, sfr@canb.auug.org.au Subject: [PATCH] KVM: PPC: drop duplicate tracepoint Date: Tue, 5 Aug 2014 12:35:56 +0200 Message-Id: <1407234956-743-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Commit 29577fc00ba4 ("KVM: PPC: HV: Remove generic instruction emulation") caused a build failure: arch/powerpc/kvm/kvm-pr.o:(__tracepoints+0xa8): multiple definition of `__tracepoint_kvm_ppc_instr' arch/powerpc/kvm/kvm.o:(__tracepoints+0x1c0): first defined here due to a duplicate definition of the tracepoint in trace.h and trace_pr.h. Because the tracepoint is still used by Book3S HV code, and because the PR code does include trace.h, just remove the duplicate definition from trace_pr.h, and export it from kvm.o. Reported-by: Stephen Rothwell Signed-off-by: Paolo Bonzini --- arch/powerpc/kvm/emulate.c | 2 ++ arch/powerpc/kvm/trace_pr.h | 20 -------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c index e96b50d0bdab..2325168ad1ff 100644 --- a/arch/powerpc/kvm/emulate.c +++ b/arch/powerpc/kvm/emulate.c @@ -300,3 +300,5 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) return emulated; } EXPORT_SYMBOL_GPL(kvmppc_emulate_instruction); + +EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_ppc_instr); diff --git a/arch/powerpc/kvm/trace_pr.h b/arch/powerpc/kvm/trace_pr.h index a674f090dfb8..e1357cd8dc1f 100644 --- a/arch/powerpc/kvm/trace_pr.h +++ b/arch/powerpc/kvm/trace_pr.h @@ -291,26 +291,6 @@ TRACE_EVENT(kvm_unmap_hva, TP_printk("unmap hva 0x%lx\n", __entry->hva) ); -TRACE_EVENT(kvm_ppc_instr, - TP_PROTO(unsigned int inst, unsigned long _pc, unsigned int emulate), - TP_ARGS(inst, _pc, emulate), - - TP_STRUCT__entry( - __field( unsigned int, inst ) - __field( unsigned long, pc ) - __field( unsigned int, emulate ) - ), - - TP_fast_assign( - __entry->inst = inst; - __entry->pc = _pc; - __entry->emulate = emulate; - ), - - TP_printk("inst %u pc 0x%lx emulate %u\n", - __entry->inst, __entry->pc, __entry->emulate) -); - #endif /* _TRACE_KVM_H */ /* This part must be outside protection */