From: Aristeu Rozanski <aris@redhat.com>
Date: Mon, 7 Dec 2009 11:52:15 +0000 (+0100)
Subject: [S390] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390
X-Git-Tag: MMI-PSA29.97-13-9~25715^2~10
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b0694685bc892c60009335e61af1f058f06ccf64;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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

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