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

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

diff --combined arch/x86/xen/Makefile
index ccf73b2f3e6992d6cec20f8db6042f8538913c6b,ce692013896d0c7b91f3b8bdd0881634c3052f67..45e94aca5bcef5aed5546c4a0cd25e1de5521e4e
--- 1/arch/x86/xen/Makefile
--- 2/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@@ -13,10 -13,12 +13,12 @@@ 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
  obj-$(CONFIG_XEN_DEBUG_FS)    += debugfs.o
 -
 +obj-$(CONFIG_XEN_DOM0)                += vga.o
  obj-$(CONFIG_SWIOTLB_XEN)     += pci-swiotlb-xen.o