From patchwork Wed Oct 21 15:03:31 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Alexander Graf <agraf@suse.de>
X-Patchwork-Id: 55112
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n9LF4PWr020996
	for <patchwork-kvm@patchwork.kernel.org>;
	Wed, 21 Oct 2009 15:04:27 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753997AbZJUPDu (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Wed, 21 Oct 2009 11:03:50 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753983AbZJUPDu
	(ORCPT <rfc822;kvm-outgoing>); Wed, 21 Oct 2009 11:03:50 -0400
Received: from cantor2.suse.de ([195.135.220.15]:53828 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753970AbZJUPDj (ORCPT <rfc822;kvm@vger.kernel.org>);
	Wed, 21 Oct 2009 11:03:39 -0400
Received: from relay2.suse.de (mail2.suse.de [195.135.221.8])
	by mx2.suse.de (Postfix) with ESMTP id A4DDE89E74;
	Wed, 21 Oct 2009 17:03:39 +0200 (CEST)
From: Alexander Graf <agraf@suse.de>
To: kvm@vger.kernel.org
Cc: Avi Kivity <avi@redhat.com>, kvm-ppc <kvm-ppc@vger.kernel.org>,
	Hollis Blanchard <hollisb@us.ibm.com>, Arnd Bergmann <arnd@arndb.de>,
	Benjamin Herrenschmidt <benh@kernel.crashing.org>,
	Kevin Wolf <kwolf@redhat.com>, bphilips@suse.de,
	Marcelo Tosatti <mtosatti@redhat.com>
Subject: [PATCH 25/27] Fix trace.h
Date: Wed, 21 Oct 2009 17:03:31 +0200
Message-Id: <1256137413-15256-26-git-send-email-agraf@suse.de>
X-Mailer: git-send-email 1.6.0.2
In-Reply-To: <1256137413-15256-25-git-send-email-agraf@suse.de>
References: <1256137413-15256-1-git-send-email-agraf@suse.de>
	<1256137413-15256-2-git-send-email-agraf@suse.de>
	<1256137413-15256-3-git-send-email-agraf@suse.de>
	<1256137413-15256-4-git-send-email-agraf@suse.de>
	<1256137413-15256-5-git-send-email-agraf@suse.de>
	<1256137413-15256-6-git-send-email-agraf@suse.de>
	<1256137413-15256-7-git-send-email-agraf@suse.de>
	<1256137413-15256-8-git-send-email-agraf@suse.de>
	<1256137413-15256-9-git-send-email-agraf@suse.de>
	<1256137413-15256-10-git-send-email-agraf@suse.de>
	<1256137413-15256-11-git-send-email-agraf@suse.de>
	<1256137413-15256-12-git-send-email-agraf@suse.de>
	<1256137413-15256-13-git-send-email-agraf@suse.de>
	<1256137413-15256-14-git-send-email-agraf@suse.de>
	<1256137413-15256-15-git-send-email-agraf@suse.de>
	<1256137413-15256-16-git-send-email-agraf@suse.de>
	<1256137413-15256-17-git-send-email-agraf@suse.de>
	<1256137413-15256-18-git-send-email-agraf@suse.de>
	<1256137413-15256-19-git-send-email-agraf@suse.de>
	<1256137413-15256-20-git-send-email-agraf@suse.de>
	<1256137413-15256-21-git-send-email-agraf@suse.de>
	<1256137413-15256-22-git-send-email-agraf@suse.de>
	<1256137413-15256-23-git-send-email-agraf@suse.de>
	<1256137413-15256-24-git-send-email-agraf@suse.de>
	<1256137413-15256-25-git-send-email-agraf@suse.de>
Sender: kvm-owner@vger.kernel.org
Precedence: bulk
List-ID: <kvm.vger.kernel.org>
X-Mailing-List: kvm@vger.kernel.org


diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h
index 67f219d..a8e8400 100644
--- a/arch/powerpc/kvm/trace.h
+++ b/arch/powerpc/kvm/trace.h
@@ -12,8 +12,8 @@
  * Tracepoint for guest mode entry.
  */
 TRACE_EVENT(kvm_ppc_instr,
-	TP_PROTO(unsigned int inst, unsigned long pc, unsigned int emulate),
-	TP_ARGS(inst, pc, emulate),
+	TP_PROTO(unsigned int inst, unsigned long _pc, unsigned int emulate),
+	TP_ARGS(inst, _pc, emulate),
 
 	TP_STRUCT__entry(
 		__field(	unsigned int,	inst		)
@@ -23,7 +23,7 @@ TRACE_EVENT(kvm_ppc_instr,
 
 	TP_fast_assign(
 		__entry->inst		= inst;
-		__entry->pc		= pc;
+		__entry->pc		= _pc;
 		__entry->emulate	= emulate;
 	),