From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932489Ab0DGCKG (ORCPT ); Tue, 6 Apr 2010 22:10:06 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:64308 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932336Ab0DGCJ6 (ORCPT ); Tue, 6 Apr 2010 22:09:58 -0400 X-Authority-Analysis: v=1.1 cv=1G73JCAd+9Vhhx30tk0+Sc/rngIYAy4Ia+6Xn7XSY0k= c=1 sm=0 a=BO6IbA3vFFgA:10 a=7U3hwN5JcxgA:10 a=Q9fys5e9bTEA:10 a=gMqfjgEr1zLu/65IO0LwxA==:17 a=VwQbUJbxAAAA:8 a=20KFwNOVAAAA:8 a=voM4FWlXAAAA:8 a=VnNF1IyMAAAA:8 a=wMNdZWldAAAA:8 a=meVymXHHAAAA:8 a=2z1xijffhQBFzOa7N6UA:9 a=eYVlgc7oF8QzrHy3AiNMwPoV0L4A:4 a=PUjeQqilurYA:10 a=jEp0ucaQiEUA:10 a=oUQuMaGMe1cA:10 a=uuC-6zdX0R0A:10 a=jeBq3FmKZ4MA:10 a=gMqfjgEr1zLu/65IO0LwxA==:117 X-Cloudmark-Score: 0 X-Originating-IP: 74.67.89.75 Subject: [PATCH][GIT PULL] powerpc/tracing: Move TRACE_SYSTEM out of #if protection From: Steven Rostedt Reply-To: rostedt@goodmis.org To: LKML Cc: Benjamin Herrenschmidt , Avi Kivity , Marcelo Tosatti , Hollis Blanchard , Jeremy Kerr , Christoph Hellwig Content-Type: text/plain; charset="ISO-8859-15" Organization: Kihon Technologies Inc. Date: Tue, 06 Apr 2010 22:09:55 -0400 Message-ID: <1270606195.19685.15615.camel@gandalf.stny.rr.com> Mime-Version: 1.0 X-Mailer: Evolution 2.28.2 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ben, You can pull this or just use this patch, which ever you prefer. Please pull the latest powerpc tree, which can be found at: git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git powerpc Steven Rostedt (1): powerpc/tracing: Move TRACE_SYSTEM out of #if protection ---- arch/powerpc/kvm/trace.h | 13 ++++++++----- arch/powerpc/platforms/cell/spufs/sputrace.h | 7 ++++--- 2 files changed, 12 insertions(+), 8 deletions(-) --------------------------- commit 2ce066a4ff9869681f8819c76f0c58af4333ec58 Author: Steven Rostedt Date: Tue Apr 6 22:04:21 2010 -0400 powerpc/tracing: Move TRACE_SYSTEM out of #if protection As explained in: commit d0b6e04a4cd8360e3c9c419f7c30a3081a0c142a tracing/events: Move TRACE_SYSTEM outside of include guard The TRACE_SYSTEM must be outside the #if include protection. Cc: Christoph Hellwig Cc: Jeremy Kerr Cc: Hollis Blanchard Cc: Marcelo Tosatti Cc: Avi Kivity Cc: Benjamin Herrenschmidt Signed-off-by: Steven Rostedt diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h index a8e8400..fcc6a6b 100644 --- a/arch/powerpc/kvm/trace.h +++ b/arch/powerpc/kvm/trace.h @@ -1,13 +1,11 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM kvm + #if !defined(_TRACE_KVM_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_KVM_H #include -#undef TRACE_SYSTEM -#define TRACE_SYSTEM kvm -#define TRACE_INCLUDE_PATH . -#define TRACE_INCLUDE_FILE trace - /* * Tracepoint for guest mode entry. */ @@ -100,5 +98,10 @@ TRACE_EVENT(kvm_gtlb_write, #endif /* _TRACE_KVM_H */ +#undef TRACE_INCLUDE_PATH +#undef TRACE_INCLUDE_FILE +#define TRACE_INCLUDE_PATH . +#define TRACE_INCLUDE_FILE trace + /* This part must be outside protection */ #include diff --git a/arch/powerpc/platforms/cell/spufs/sputrace.h b/arch/powerpc/platforms/cell/spufs/sputrace.h index db2656a..12a469a 100644 --- a/arch/powerpc/platforms/cell/spufs/sputrace.h +++ b/arch/powerpc/platforms/cell/spufs/sputrace.h @@ -1,11 +1,11 @@ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM spufs + #if !defined(_TRACE_SPUFS_H) || defined(TRACE_HEADER_MULTI_READ) #define _TRACE_SPUFS_H #include -#undef TRACE_SYSTEM -#define TRACE_SYSTEM spufs - TRACE_EVENT(spufs_context, TP_PROTO(struct spu_context *ctx, struct spu *spu, const char *name), TP_ARGS(ctx, spu, name), @@ -34,6 +34,7 @@ TRACE_EVENT(spufs_context, #endif /* _TRACE_SPUFS_H */ #undef TRACE_INCLUDE_PATH +#undef TRACE_INCLUDE_FILE #define TRACE_INCLUDE_PATH . #define TRACE_INCLUDE_FILE sputrace #include