summaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2011-08-03 09:43:44 -0700
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-08-04 15:31:27 -0400
commit1e9ea2656b656edd3c8de98675bbc0340211b5bd (patch)
treed468c0144e083d031e5d7d1e78ba5b76d438e3ba /arch/x86
parent65d4b248114e18b3d805c7ecb88d9ea64dd978e4 (diff)
downloadlinux-3.10-1e9ea2656b656edd3c8de98675bbc0340211b5bd.tar.gz
linux-3.10-1e9ea2656b656edd3c8de98675bbc0340211b5bd.tar.bz2
linux-3.10-1e9ea2656b656edd3c8de98675bbc0340211b5bd.zip
xen/tracing: it looks like we wanted CONFIG_FTRACE
Apparently we wanted CONFIG_FTRACE rather the CONFIG_FUNCTION_TRACER. Reported-by: Sander Eikelenboom <linux@eikelenboom.it> Tested-by: Sander Eikelenboom <linux@eikelenboom.it> Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/xen/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile
index 45e94aca5bc..3326204e251 100644
--- a/arch/x86/xen/Makefile
+++ b/arch/x86/xen/Makefile
@@ -15,7 +15,7 @@ obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \
grant-table.o suspend.o platform-pci-unplug.o \
p2m.o
-obj-$(CONFIG_FUNCTION_TRACER) += trace.o
+obj-$(CONFIG_FTRACE) += trace.o
obj-$(CONFIG_SMP) += smp.o
obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o