lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen/tracing: fix compile errors when tracing is disabled.
This commit is contained in:
Linus Torvalds
2011-07-29 23:33:40 -07:00
parent 8f57be8ee4 b3c4b98250
commit b993fdbc7f
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/xen/Makefile
View File

@@ -13,7 +13,9 @@ CFLAGS_mmu.o := $(nostackp)
obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \
time.o xen-asm.o xen-asm_$(BITS).o \ time.o xen-asm.o xen-asm_$(BITS).o \
grant-table.o suspend.o platform-pci-unplug.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_SMP) += smp.o
obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o

2
include/trace/events/xen.h
View File

@@ -8,6 +8,8 @@
#include <asm/paravirt_types.h> #include <asm/paravirt_types.h>
#include <asm/xen/trace_types.h> #include <asm/xen/trace_types.h>
struct multicall_entry;
/* Multicalls */ /* Multicalls */
DECLARE_EVENT_CLASS(xen_mc__batch, DECLARE_EVENT_CLASS(xen_mc__batch,
TP_PROTO(enum paravirt_lazy_mode mode), TP_PROTO(enum paravirt_lazy_mode mode),