summaryrefslogtreecommitdiffstats
path: root/arch/s390/kernel/Makefile
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2014-10-07 15:45:10 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2014-10-09 09:14:18 +0200
commit53255c9a4dade6ff2162121430d13aaadb38a69c (patch)
tree1f6514d2397a3a10922abbdda3c59f792147a5c2 /arch/s390/kernel/Makefile
parenta62bc0739253939d6fce40d51d92412252a9bb55 (diff)
downloadlinux-53255c9a4dade6ff2162121430d13aaadb38a69c.tar.bz2
s390/ftrace: remove 31 bit ftrace support
31 bit and 64 bit diverge more and more and it is rather painful to keep both parts running. To make things simpler just remove the 31 bit support which nobody uses anyway. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/kernel/Makefile')
-rw-r--r--arch/s390/kernel/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index c249785669f3..204c43a4c245 100644
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -52,8 +52,7 @@ obj-$(CONFIG_COMPAT) += compat_wrapper.o $(compat-obj-y)
obj-$(CONFIG_STACKTRACE) += stacktrace.o
obj-$(CONFIG_KPROBES) += kprobes.o
-obj-$(CONFIG_FUNCTION_TRACER) += $(if $(CONFIG_64BIT),mcount64.o,mcount.o)
-obj-$(CONFIG_FUNCTION_TRACER) += ftrace.o
+obj-$(CONFIG_FUNCTION_TRACER) += mcount.o ftrace.o
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
obj-$(CONFIG_UPROBES) += uprobes.o