]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Jul 2011 06:33:40 +0000 (23:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Jul 2011 06:33:40 +0000 (23:33 -0700)
* 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen/tracing: fix compile errors when tracing is disabled.

arch/x86/xen/Makefile
include/trace/events/xen.h

index ccf73b2f3e6992d6cec20f8db6042f8538913c6b..45e94aca5bcef5aed5546c4a0cd25e1de5521e4e 100644 (file)
@@ -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
index 44d8decee09e65990cde0a9ecac01f0451a77fed..92f1a796829e8bf175f23fd5f84e1c4bb1aebf26 100644 (file)
@@ -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),