From patchwork Fri Oct 30 15:47:25 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: 56636
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 n9UFll4a005672
	for <patchwork-kvm@patchwork.kernel.org>;
	Fri, 30 Oct 2009 15:47:48 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932518AbZJ3Prg (ORCPT
	<rfc822;patchwork-kvm@patchwork.kernel.org>);
	Fri, 30 Oct 2009 11:47:36 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932447AbZJ3Prf
	(ORCPT <rfc822;kvm-outgoing>); Fri, 30 Oct 2009 11:47:35 -0400
Received: from cantor.suse.de ([195.135.220.2]:53083 "EHLO mx1.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S932485AbZJ3Pr2 (ORCPT <rfc822;kvm@vger.kernel.org>);
	Fri, 30 Oct 2009 11:47:28 -0400
Received: from relay1.suse.de (mail2.suse.de [195.135.221.8])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.suse.de (Postfix) with ESMTP id 5A9FB94A1C;
	Fri, 30 Oct 2009 16:47:32 +0100 (CET)
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>, Olof Johansson <olof@lixom.net>,
	linuxppc-dev@ozlabs.org
Subject: [PATCH 25/27] Fix trace.h
Date: Fri, 30 Oct 2009 16:47:25 +0100
Message-Id: <1256917647-6200-26-git-send-email-agraf@suse.de>
X-Mailer: git-send-email 1.6.0.2
In-Reply-To: <1256917647-6200-1-git-send-email-agraf@suse.de>
References: <1256917647-6200-1-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;
 	),