Subject: Re: [PATCH] KVM: PPC: Move and undef TRACE_INCLUDE_PATH/FILE

From: "Naveen N. Rao" <[email-masked]>
Date: Wed, 07 Nov 2018 19:49:08 +0530

Scott Wood wrote:
> TRACE_INCLUDE_PATH and TRACE_INCLUDE_FILE are used by
> <trace/define_trace.h>, so like that #include, they should
> be outside #ifdef protection.
> 
> They also need to be #undefed before defining, in case multiple trace
> headers are included by the same C file.  This became the case on
> book3e after commit cf4a6085151a ("powerpc/mm: Add missing tracepoint for
> tlbie"), leading to the following build error:
> 
>    CC      arch/powerpc/kvm/powerpc.o
> In file included from arch/powerpc/kvm/powerpc.c:51:0:
> arch/powerpc/kvm/trace.h:9:0: error: "TRACE_INCLUDE_PATH" redefined
> [-Werror]
>   #define TRACE_INCLUDE_PATH .
>   ^
> In file included from arch/powerpc/kvm/../mm/mmu_decl.h:25:0,
>                   from arch/powerpc/kvm/powerpc.c:48:
> ./arch/powerpc/include/asm/trace.h:224:0: note: this is the location of
> the previous definition
>   #define TRACE_INCLUDE_PATH asm
>   ^
> cc1: all warnings being treated as errors
> 
> Reported-by: Christian Zigotzky <[email-masked]>
> Signed-off-by: Scott Wood <[email-masked]>
> ---
>  arch/powerpc/kvm/trace.h       | 8 ++++++--
>  arch/powerpc/kvm/trace_booke.h | 9 +++++++--
>  arch/powerpc/kvm/trace_hv.h    | 9 +++++++--
>  arch/powerpc/kvm/trace_pr.h    | 9 +++++++--
>  4 files changed, 27 insertions(+), 8 deletions(-)

Thanks for getting to this. Apart from a small nit below, for this 
patch:
Reviewed-by: Naveen N. Rao <[email-masked]>

> 
> diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h
> index 491b0f715d6b..ea1d7c808319 100644
> --- a/arch/powerpc/kvm/trace.h
> +++ b/arch/powerpc/kvm/trace.h
> @@ -6,8 +6,6 @@
> 
>  #undef TRACE_SYSTEM
>  #define TRACE_SYSTEM kvm
> -#define TRACE_INCLUDE_PATH .
> -#define TRACE_INCLUDE_FILE trace

The convention is to also have the TRACE_SYSTEM macro defined outside 
and before the header #ifdef. So, that would be good to do as part of 
this cleanup as well. If not, I can send a patch later.

Thanks,
Naveen