summaryrefslogtreecommitdiffstats
path: root/arch
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 /arch
parent8f57be8ee44d92ef161c5af685aedbb717db96e0 (diff)
parentb3c4b9825075b680817b9460184e7b576dc97597 (diff)
downloadlinux-b993fdbc7fe26f96b59003a3552c418a71aa0a9f.tar.bz2
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.
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/xen/Makefile4
1 files changed, 3 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