From: Heiko Carstens Date: Fri, 15 Aug 2014 11:16:09 +0000 (+0200) Subject: s390/ftrace: enforce DYNAMIC_FTRACE if FUNCTION_TRACER is selected X-Git-Tag: fixes-against-v3.18-rc2~83^2~31 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d6a0163494c78ad7b6de733c8793e66b5da9212;p=pandora-kernel.git 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 Signed-off-by: Martin Schwidefsky --- Reading git-diff-tree failed