• Jeremy Fitzhardinge's avatar
    xen/tracing: fix compile errors when tracing is disabled. · b3c4b982
    Jeremy Fitzhardinge authored
    When CONFIG_FUNCTION_TRACER is disabled, compilation fails as follows:
      CC      arch/x86/xen/setup.o
    In file included from arch/x86/include/asm/xen/hypercall.h:42,
                     from arch/x86/xen/setup.c:19:
    include/trace/events/xen.h:31: warning: 'struct multicall_entry' declared inside parameter list
    include/trace/events/xen.h:31: warning: its scope is only this definition or declaration, which is probably not what you want
    include/trace/events/xen.h:31: warning: 'struct multicall_entry' declared inside parameter list
    include/trace/events/xen.h:31: warning: 'struct multicall_entry' declared inside parameter list
    include/trace/events/xen.h:31: warning: 'struct multicall_entry' declared inside parameter list
    [...]
    arch/x86/xen/trace.c:5: error: '__HYPERVISOR_set_trap_table' undeclared here (not in a function)
    arch/x86/xen/trace.c:5: error: array index in initializer not of integer type
    arch/x86/xen/trace.c:5: error: (near initialization for 'xen_hypercall_names')
    arch/x86/xen/trace.c:6: error: '__HYPERVISOR_mmu_update' undeclared here (not in a function)
    arch/x86/xen/trace.c:6: error: array index in initializer not of integer type
    arch/x86/xen/trace.c:6: error: (near initialization for 'xen_hypercall_names')
    
    Fix this by making sure struct multicall_entry has a declaration in
    scope at all times, and don't bother compiling xen/trace.c when tracing
    is disabled.
    Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
    Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
    b3c4b982
xen.h 15.5 KB