OSDN Git Service

s390/ftrace: enforce DYNAMIC_FTRACE if FUNCTION_TRACER is selected
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Fri, 15 Aug 2014 11:16:09 +0000 (13:16 +0200)
committerMartin Schwidefsky <schwidefsky@de.ibm.com>
Tue, 9 Sep 2014 06:53:29 +0000 (08:53 +0200)
commit5d6a0163494c78ad7b6de733c8793e66b5da9212
tree7e3e83ca5f2af8da1d564094931daa83b9f1bf60
parent10dec7dbd50ab0be96dda085d625d54ce800e426
s390/ftrace: enforce DYNAMIC_FTRACE if FUNCTION_TRACER is selected

We have too many combinations for function tracing. Lets simply stick to
the most advanced option, so we don't have to care of other combinations.

This means we always select DYNAMIC_FTRACE if FUNCTION_TRACER is selected.

In the s390 Makefile also remove CONFIG_FTRACE_SYSCALLS since that
functionality got moved to architecture independent code in the meantime.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
arch/s390/Kconfig
arch/s390/kernel/Makefile
arch/s390/kernel/ftrace.c
arch/s390/kernel/mcount.S
arch/s390/kernel/mcount64.S