Re: KVM: PPC: Move and undef TRACE_INCLUDE_PATH/FILE
From: Michael Ellerman <hidden>
Date: 2018-11-07 21:33:38
Also in:
kvm
On Wed, 2018-11-07 at 01:49:34 UTC, 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 <redacted>
Signed-off-by: Scott Wood <oss@buserror.net>Applied to powerpc fixes, thanks. https://git.kernel.org/powerpc/c/28c5bcf74fa07c25d5bd118d127192 cheers