summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAristeu Rozanski <aris@redhat.com>2009-12-07 14:52:15 +0300
committerMartin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com>2009-12-07 14:51:38 +0300
commitb0694685bc892c60009335e61af1f058f06ccf64 (patch)
treebd6593378b8134816485164fc8f3a97884d02fc2
parentbd119ee29b447c521d66f6a5095fd3533d845da7 (diff)
downloadlinux-b0694685bc892c60009335e61af1f058f06ccf64.tar.xz
[S390] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390
Trying to build a s390x kernel with CONFIG_FTRACE_SYSCALLS will fail because ftrace.o is not built/linked. Acked-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Aristeu Rozanski <aris@redhat.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/kernel/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index c7be8e10b87e..683f6381cc59 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -44,6 +44,7 @@ obj-$(CONFIG_KPROBES) += kprobes.o
obj-$(CONFIG_FUNCTION_TRACER) += $(if $(CONFIG_64BIT),mcount64.o,mcount.o)
obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
+obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o
# Kexec part
S390_KEXEC_OBJS := machine_kexec.o crash.o