commit b0694685bc892c60009335e61af1f058f06ccf64
author Aristeu Rozanski <aris@redhat.com> Mon Dec 07 12:52:15 2009 +0100
committer Martin Schwidefsky <sky@mschwide.boeblingen.de.ibm.com> Mon Dec 07 12:51:38 2009 +0100
tree bd6593378b8134816485164fc8f3a97884d02fc2
parent bd119ee29b447c521d66f6a5095fd3533d845da7

[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>

arch/s390/kernel/Makefile

diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index c7be8e1..683f638 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -44,6 +44,7 @@
 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