Commit 28c5bcf7 authored by Scott Wood's avatar Scott Wood Committed by Michael Ellerman
Browse files

KVM: PPC: Move and undef TRACE_INCLUDE_PATH/FILE 



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 cf4a6085 ("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: default avatarChristian Zigotzky <chzigotzky@xenosoft.de>
Signed-off-by: default avatarScott Wood <oss@buserror.net>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 9586d569

arch/powerpc/kvm/trace.h

+6 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 


#undef TRACE_SYSTEM

#define TRACE_SYSTEM kvm

#define TRACE_INCLUDE_PATH .

#define TRACE_INCLUDE_FILE trace



/*

 * Tracepoint for guest mode entry.
@@ -120,4 +118,10 @@ TRACE_EVENT(kvm_check_requests, 
#endif /* _TRACE_KVM_H */



/* This part must be outside protection */

#undef TRACE_INCLUDE_PATH

#undef TRACE_INCLUDE_FILE



#define TRACE_INCLUDE_PATH .

#define TRACE_INCLUDE_FILE trace



#include <trace/define_trace.h>

arch/powerpc/kvm/trace_booke.h

+7 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 


#undef TRACE_SYSTEM

#define TRACE_SYSTEM kvm_booke

#define TRACE_INCLUDE_PATH .

#define TRACE_INCLUDE_FILE trace_booke



#define kvm_trace_symbol_exit \

	{0, "CRITICAL"}, \
@@ -218,4 +216,11 @@ TRACE_EVENT(kvm_booke_queue_irqprio, 
#endif



/* This part must be outside protection */



#undef TRACE_INCLUDE_PATH

#undef TRACE_INCLUDE_FILE



#define TRACE_INCLUDE_PATH .

#define TRACE_INCLUDE_FILE trace_booke



#include <trace/define_trace.h>

arch/powerpc/kvm/trace_hv.h

+7 −2
Original line number Diff line number Diff line
@@ -9,8 +9,6 @@ 


#undef TRACE_SYSTEM

#define TRACE_SYSTEM kvm_hv

#define TRACE_INCLUDE_PATH .

#define TRACE_INCLUDE_FILE trace_hv



#define kvm_trace_symbol_hcall \

	{H_REMOVE,			"H_REMOVE"}, \
@@ -497,4 +495,11 @@ TRACE_EVENT(kvmppc_run_vcpu_exit, 
#endif /* _TRACE_KVM_HV_H */



/* This part must be outside protection */



#undef TRACE_INCLUDE_PATH

#undef TRACE_INCLUDE_FILE



#define TRACE_INCLUDE_PATH .

#define TRACE_INCLUDE_FILE trace_hv



#include <trace/define_trace.h>

arch/powerpc/kvm/trace_pr.h

+7 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 


#undef TRACE_SYSTEM

#define TRACE_SYSTEM kvm_pr

#define TRACE_INCLUDE_PATH .

#define TRACE_INCLUDE_FILE trace_pr



TRACE_EVENT(kvm_book3s_reenter,

	TP_PROTO(int r, struct kvm_vcpu *vcpu),
@@ -257,4 +255,11 @@ TRACE_EVENT(kvm_exit, 
#endif /* _TRACE_KVM_H */



/* This part must be outside protection */



#undef TRACE_INCLUDE_PATH

#undef TRACE_INCLUDE_FILE



#define TRACE_INCLUDE_PATH .

#define TRACE_INCLUDE_FILE trace_pr



#include <trace/define_trace.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE