• Scott Wood's avatar
    KVM: PPC: Move and undef TRACE_INCLUDE_PATH/FILE · 8bb923f5
    Scott Wood authored
    [ 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: 's avatarChristian Zigotzky <chzigotzky@xenosoft.de>
    Signed-off-by: 's avatarScott Wood <oss@buserror.net>
    Signed-off-by: 's avatarMichael Ellerman <mpe@ellerman.id.au>
    Signed-off-by: 's avatarSasha Levin <sashal@kernel.org>
    8bb923f5
trace_hv.h 13.8 KB