Commit b993fdbc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen 

* 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen/tracing: fix compile errors when tracing is disabled.
parents 8f57be8e b3c4b982

arch/x86/xen/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ CFLAGS_mmu.o := $(nostackp) 
obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \

			time.o xen-asm.o xen-asm_$(BITS).o \

			grant-table.o suspend.o platform-pci-unplug.o \

			p2m.o trace.o

			p2m.o



obj-$(CONFIG_FUNCTION_TRACER) += trace.o



obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o

include/trace/events/xen.h

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
#include <asm/paravirt_types.h>

#include <asm/xen/trace_types.h>



struct multicall_entry;



/* Multicalls */

DECLARE_EVENT_CLASS(xen_mc__batch,

	    TP_PROTO(enum paravirt_lazy_mode mode),