From: Alexander Graf <agraf-l3A5Bk7waGM@public.gmane.org>
To: kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: Avi Kivity <avi-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
kvm-ppc <kvm-ppc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>,
Hollis Blanchard
<hollisb-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org>,
Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>,
Benjamin Herrenschmidt
<benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>,
Kevin Wolf <kwolf-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>,
bphilips-l3A5Bk7waGM@public.gmane.org,
Marcelo Tosatti
<mtosatti-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
Subject: [PATCH 25/27] Fix trace.h
Date: Wed, 21 Oct 2009 17:03:31 +0200 [thread overview]
Message-ID: <1256137413-15256-26-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1256137413-15256-25-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
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-l3A5Bk7waGM@public.gmane.org>
---
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-21 15:03 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-21 15:03 [PATCH 00/27] Add KVM support for Book3s_64 (PPC64) hosts v5 Alexander Graf
2009-10-21 15:03 ` [PATCH 01/27] Move dirty logging code to sub-arch Alexander Graf
[not found] ` <1256137413-15256-2-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-21 15:03 ` [PATCH 02/27] Pass PVR in sregs Alexander Graf
2009-10-21 15:03 ` [PATCH 03/27] Add Book3s definitions Alexander Graf
2009-10-21 15:03 ` [PATCH 04/27] Add Book3s fields to vcpu structs Alexander Graf
2009-10-21 15:03 ` [PATCH 05/27] Add asm/kvm_book3s.h Alexander Graf
2009-10-21 15:03 ` [PATCH 06/27] Add Book3s_64 intercept helpers Alexander Graf
2009-10-21 15:03 ` [PATCH 07/27] Add book3s_64 highmem asm code Alexander Graf
[not found] ` <1256137413-15256-8-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-21 15:03 ` [PATCH 08/27] Add SLB switching code for entry/exit Alexander Graf
[not found] ` <1256137413-15256-9-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-21 15:03 ` [PATCH 09/27] Add interrupt handling code Alexander Graf
[not found] ` <1256137413-15256-10-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-21 15:03 ` [PATCH 10/27] Add book3s.c Alexander Graf
2009-10-21 15:03 ` [PATCH 11/27] Add book3s_64 Host MMU handling Alexander Graf
2009-10-21 15:03 ` [PATCH 12/27] Add book3s_64 guest MMU Alexander Graf
[not found] ` <1256137413-15256-13-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-21 15:03 ` [PATCH 13/27] Add book3s_32 " Alexander Graf
[not found] ` <1256137413-15256-14-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-21 15:03 ` [PATCH 14/27] Add book3s_64 specific opcode emulation Alexander Graf
[not found] ` <1256137413-15256-15-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-21 15:03 ` [PATCH 15/27] Add mfdec emulation Alexander Graf
[not found] ` <1256137413-15256-16-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-21 15:03 ` [PATCH 16/27] Add desktop PowerPC specific emulation Alexander Graf
[not found] ` <1256137413-15256-17-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-21 15:03 ` [PATCH 17/27] Make head_64.S aware of KVM real mode code Alexander Graf
2009-10-21 15:03 ` [PATCH 18/27] Add Book3s_64 offsets to asm-offsets.c Alexander Graf
[not found] ` <1256137413-15256-19-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-21 15:03 ` [PATCH 19/27] Export symbols for KVM module Alexander Graf
[not found] ` <1256137413-15256-20-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-21 15:03 ` [PATCH 20/27] Split init_new_context and destroy_context Alexander Graf
[not found] ` <1256137413-15256-21-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-21 15:03 ` [PATCH 21/27] Export KVM symbols for module Alexander Graf
2009-10-21 15:03 ` [PATCH 22/27] Add fields to PACA Alexander Graf
[not found] ` <1256137413-15256-23-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-21 15:03 ` [PATCH 23/27] Export new PACA constants in asm-offsets Alexander Graf
2009-10-21 15:03 ` [PATCH 24/27] Include Book3s_64 target in buildsystem Alexander Graf
[not found] ` <1256137413-15256-25-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-21 15:03 ` Alexander Graf [this message]
2009-10-21 15:03 ` [PATCH 26/27] Use Little Endian for Dirty Bitmap Alexander Graf
[not found] ` <1256137413-15256-27-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-21 15:03 ` [PATCH 27/27] Use hrtimers for the decrementer Alexander Graf
[not found] ` <1256137413-15256-24-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-29 2:50 ` [PATCH 23/27] Export new PACA constants in asm-offsets Benjamin Herrenschmidt
2009-10-29 2:50 ` [PATCH 22/27] Add fields to PACA Benjamin Herrenschmidt
2009-10-29 2:48 ` [PATCH 20/27] Split init_new_context and destroy_context Benjamin Herrenschmidt
2009-10-29 2:46 ` [PATCH 19/27] Export symbols for KVM module Benjamin Herrenschmidt
2009-10-29 2:53 ` Alexander Graf
2009-10-29 2:45 ` [PATCH 18/27] Add Book3s_64 offsets to asm-offsets.c Benjamin Herrenschmidt
[not found] ` <1256137413-15256-18-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-29 2:45 ` [PATCH 17/27] Make head_64.S aware of KVM real mode code Benjamin Herrenschmidt
2009-10-21 15:22 ` [PATCH 00/27] Add KVM support for Book3s_64 (PPC64) hosts v5 Alexander Graf
[not found] ` <1256137413-15256-1-git-send-email-agraf-l3A5Bk7waGM@public.gmane.org>
2009-10-22 13:26 ` Arnd Bergmann
2009-10-23 0:33 ` Hollis Blanchard
[not found] ` <1256258028.7495.34.camel-6XWu2dSDoRTcKpUcGLbliUEOCMrvLtNR@public.gmane.org>
2009-10-25 13:01 ` Avi Kivity
[not found] ` <4AE44C14.8040507-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2009-10-26 21:18 ` Hollis Blanchard
2009-10-29 2:55 ` Benjamin Herrenschmidt
2009-10-26 23:06 ` Olof Johansson
[not found] ` <20091026230632.GB5366-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>
2009-10-26 23:20 ` Hollis Blanchard
2009-10-26 23:21 ` Olof Johansson
2009-10-27 8:56 ` Avi Kivity
2009-10-27 13:42 ` Alexander Graf
[not found] ` <8E92E3B9-39D5-4D71-8B8E-96B49430B67B-l3A5Bk7waGM@public.gmane.org>
2009-10-27 15:49 ` Avi Kivity
-- strict thread matches above, loose matches on Subject: below --
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 25/27] Fix trace.h Alexander Graf
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=1256137413-15256-26-git-send-email-agraf@suse.de \
--to=agraf-l3a5bk7wagm@public.gmane.org \
--cc=arnd-r2nGTMty4D4@public.gmane.org \
--cc=avi-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org \
--cc=bphilips-l3A5Bk7waGM@public.gmane.org \
--cc=hollisb-r/Jw6+rmf7HQT0dZR+AlfA@public.gmane.org \
--cc=kvm-ppc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
--cc=kwolf-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
--cc=mtosatti-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org \
/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