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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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

Linus Torvalds 14 years ago b993fdbc 8f57be8e

+5 -1

2 changed files

expand all

arch

x86

xen

Makefile

include

trace

events

xen.h

+3 -1

arch/x86/xen/Makefile

··· 13 13 obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ 14 14 time.o xen-asm.o xen-asm_$(BITS).o \ 15 15 grant-table.o suspend.o platform-pci-unplug.o \ 16 - p2m.o trace.o 16 + p2m.o 17 + 18 + obj-$(CONFIG_FUNCTION_TRACER) += trace.o 17 19 18 20 obj-$(CONFIG_SMP) += smp.o 19 21 obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o

include/trace/events/xen.h

··· 8 8 #include <asm/paravirt_types.h> 9 9 #include <asm/xen/trace_types.h> 10 10 11 + struct multicall_entry; 12 + 11 13 /* Multicalls */ 12 14 DECLARE_EVENT_CLASS(xen_mc__batch, 13 15 TP_PROTO(enum paravirt_lazy_mode mode),