| From e0872cff2c0cd8b692b04bf360ef07c335c3610e Mon Sep 17 00:00:00 2001 |
| From: Scott Wood <oss@buserror.net> |
| Date: Tue, 6 Nov 2018 19:49:34 -0600 |
| Subject: KVM: PPC: Move and undef TRACE_INCLUDE_PATH/FILE |
| |
| [ Upstream commit 28c5bcf74fa07c25d5bd118d1271920f51ce2a98 ] |
| |
| 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 <chzigotzky@xenosoft.de> |
| Signed-off-by: Scott Wood <oss@buserror.net> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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(-) |
| |
| diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h |
| index 2e0e67ef3544..e8cedf32345a 100644 |
| --- a/arch/powerpc/kvm/trace.h |
| +++ b/arch/powerpc/kvm/trace.h |
| @@ -5,8 +5,6 @@ |
| |
| #undef TRACE_SYSTEM |
| #define TRACE_SYSTEM kvm |
| -#define TRACE_INCLUDE_PATH . |
| -#define TRACE_INCLUDE_FILE trace |
| |
| /* |
| * Tracepoint for guest mode entry. |
| @@ -119,4 +117,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> |
| diff --git a/arch/powerpc/kvm/trace_booke.h b/arch/powerpc/kvm/trace_booke.h |
| index 7ec534d1db9f..7eadbf449a1f 100644 |
| --- a/arch/powerpc/kvm/trace_booke.h |
| +++ b/arch/powerpc/kvm/trace_booke.h |
| @@ -5,8 +5,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"}, \ |
| @@ -217,4 +215,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> |
| diff --git a/arch/powerpc/kvm/trace_hv.h b/arch/powerpc/kvm/trace_hv.h |
| index 33d9daff5783..d1bfe017d751 100644 |
| --- a/arch/powerpc/kvm/trace_hv.h |
| +++ b/arch/powerpc/kvm/trace_hv.h |
| @@ -8,8 +8,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"}, \ |
| @@ -474,4 +472,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> |
| diff --git a/arch/powerpc/kvm/trace_pr.h b/arch/powerpc/kvm/trace_pr.h |
| index 810507cb688a..1e40aa2aa5af 100644 |
| --- a/arch/powerpc/kvm/trace_pr.h |
| +++ b/arch/powerpc/kvm/trace_pr.h |
| @@ -7,8 +7,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), |
| @@ -271,4 +269,11 @@ TRACE_EVENT(kvm_unmap_hva, |
| #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> |
| -- |
| 2.17.1 |
| |