From: Alexander Graf <agraf@suse.de>
To: kvm@vger.kernel.org
Cc: Kevin Wolf <kwolf@redhat.com>, Arnd Bergmann <arnd@arndb.de>,
Hollis Blanchard <hollisb@us.ibm.com>,
Marcelo Tosatti <mtosatti@redhat.com>,
kvm-ppc <kvm-ppc@vger.kernel.org>,
linuxppc-dev@ozlabs.org, Avi Kivity <avi@redhat.com>,
bphilips@suse.de, Olof Johansson <olof@lixom.net>
Subject: [PATCH 25/27] Fix trace.h
Date: Fri, 30 Oct 2009 16:47:25 +0100 [thread overview]
Message-ID: <1256917647-6200-26-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1256917647-6200-1-git-send-email-agraf@suse.de>
It looks like the variable "pc" is defined. At least the current code always
failed on me stating that "pc" is already defined somewhere else.
Let's use _pc instead, because that doesn't collide.
Is this the right approach? Does it break on 440 too? If not, why not?
Signed-off-by: Alexander Graf <agraf@suse.de>
---
arch/powerpc/kvm/trace.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
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;
),
--
1.6.0.2
next prev parent reply other threads:[~2009-10-30 15:47 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-30 15:47 [PATCH 00/27] Add KVM support for Book3s_64 (PPC64) hosts v6 Alexander Graf
2009-10-30 15:47 ` [PATCH 01/27] Move dirty logging code to sub-arch Alexander Graf
2009-10-30 15:47 ` [PATCH 02/27] Pass PVR in sregs Alexander Graf
2009-10-30 15:47 ` [PATCH 03/27] Add Book3s definitions Alexander Graf
2009-10-30 15:47 ` [PATCH 04/27] Add Book3s fields to vcpu structs Alexander Graf
2009-10-30 15:47 ` [PATCH 05/27] Add asm/kvm_book3s.h Alexander Graf
2009-10-30 15:47 ` [PATCH 06/27] Add Book3s_64 intercept helpers Alexander Graf
2009-10-30 15:47 ` [PATCH 07/27] Add book3s_64 highmem asm code Alexander Graf
2009-10-30 15:47 ` [PATCH 08/27] Add SLB switching code for entry/exit Alexander Graf
2009-11-01 23:23 ` Michael Neuling
2009-11-02 9:23 ` Alexander Graf
2009-11-02 9:39 ` Michael Neuling
2009-11-02 9:59 ` Alexander Graf
2009-10-30 15:47 ` [PATCH 09/27] Add interrupt handling code Alexander Graf
2009-10-30 15:47 ` [PATCH 10/27] Add book3s.c Alexander Graf
2009-10-30 15:47 ` [PATCH 11/27] Add book3s_64 Host MMU handling Alexander Graf
2009-11-01 23:39 ` Michael Neuling
2009-11-02 9:26 ` Alexander Graf
2009-10-30 15:47 ` [PATCH 12/27] Add book3s_64 guest MMU Alexander Graf
2009-10-30 15:47 ` [PATCH 13/27] Add book3s_32 " Alexander Graf
2009-10-30 15:47 ` [PATCH 14/27] Add book3s_64 specific opcode emulation Alexander Graf
2009-11-03 8:47 ` Segher Boessenkool
2009-11-03 9:06 ` Alexander Graf
2009-11-03 21:38 ` Benjamin Herrenschmidt
2009-11-04 8:43 ` Arnd Bergmann
2009-11-04 8:47 ` Benjamin Herrenschmidt
2009-11-04 11:35 ` Alexander Graf
2009-11-05 0:53 ` Segher Boessenkool
2009-11-05 10:09 ` Alexander Graf
2009-10-30 15:47 ` [PATCH 15/27] Add mfdec emulation Alexander Graf
2009-10-30 15:47 ` [PATCH 16/27] Add desktop PowerPC specific emulation Alexander Graf
2009-10-30 15:47 ` [PATCH 17/27] Make head_64.S aware of KVM real mode code Alexander Graf
2009-10-30 15:47 ` [PATCH 18/27] Add Book3s_64 offsets to asm-offsets.c Alexander Graf
2009-10-30 15:47 ` [PATCH 19/27] Export symbols for KVM module Alexander Graf
2009-10-31 4:37 ` Stephen Rothwell
2009-10-31 12:02 ` Alexander Graf
2009-10-30 15:47 ` [PATCH 20/27] Split init_new_context and destroy_context Alexander Graf
2009-10-31 4:40 ` Stephen Rothwell
2009-10-31 21:20 ` Alexander Graf
2009-10-31 21:37 ` Benjamin Herrenschmidt
2009-10-30 15:47 ` [PATCH 21/27] Export KVM symbols for module Alexander Graf
2009-10-30 15:47 ` [PATCH 22/27] Add fields to PACA Alexander Graf
2009-10-30 15:47 ` [PATCH 23/27] Export new PACA constants in asm-offsets Alexander Graf
2009-10-30 15:47 ` [PATCH 24/27] Include Book3s_64 target in buildsystem Alexander Graf
2009-10-30 15:47 ` Alexander Graf [this message]
2009-10-30 15:47 ` [PATCH 26/27] Use Little Endian for Dirty Bitmap Alexander Graf
2009-10-30 15:47 ` [PATCH 27/27] Use hrtimers for the decrementer Alexander Graf
2009-11-05 6:03 ` [PATCH 00/27] Add KVM support for Book3s_64 (PPC64) hosts v6 Benjamin Herrenschmidt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1256917647-6200-26-git-send-email-agraf@suse.de \
--to=agraf@suse.de \
--cc=arnd@arndb.de \
--cc=avi@redhat.com \
--cc=bphilips@suse.de \
--cc=hollisb@us.ibm.com \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=kwolf@redhat.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=mtosatti@redhat.com \
--cc=olof@lixom.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).