summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-07-29 23:33:40 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-29 23:33:40 -0700
commitb993fdbc7fe26f96b59003a3552c418a71aa0a9f (patch)
treed5ffe93095c2111b7a68e1f0cc0b2f6e2388e990
parent8f57be8ee44d92ef161c5af685aedbb717db96e0 (diff)
parentb3c4b9825075b680817b9460184e7b576dc97597 (diff)
downloadblackbird-op-linux-b993fdbc7fe26f96b59003a3552c418a71aa0a9f.tar.gz
blackbird-op-linux-b993fdbc7fe26f96b59003a3552c418a71aa0a9f.zip
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.
-rw-r--r--arch/x86/xen/Makefile4
-rw-r--r--include/trace/events/xen.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
index ccf73b2f3e69..45e94aca5bce 100644
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@ -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
diff --git a/include/trace/events/xen.h b/include/trace/events/xen.h
index 44d8decee09e..92f1a796829e 100644
--- a/include/trace/events/xen.h
+++ b/include/trace/events/xen.h
@@ -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),
OpenPOWER on IntegriCloud