summaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorNaveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>2020-11-26 23:38:39 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-11 13:22:06 +0100
commitcd6bd84b19ac9d9cfd3c48eb8425f1dfabbb607a (patch)
treed3f970036ae8fa54f01f2f1fc0da8fe957840486 /kernel/trace
parent009b4bd377a92c32ef76223a15727037af3ded9c (diff)
downloadlinux-stable-cd6bd84b19ac9d9cfd3c48eb8425f1dfabbb607a.tar.gz
linux-stable-cd6bd84b19ac9d9cfd3c48eb8425f1dfabbb607a.tar.bz2
linux-stable-cd6bd84b19ac9d9cfd3c48eb8425f1dfabbb607a.zip
ftrace: Fix DYNAMIC_FTRACE_WITH_DIRECT_CALLS dependency
commit 49a962c075dfa41c78e34784772329bc8784d217 upstream. DYNAMIC_FTRACE_WITH_DIRECT_CALLS should depend on DYNAMIC_FTRACE_WITH_REGS since we need ftrace_regs_caller(). Link: https://lkml.kernel.org/r/fc4b257ea8689a36f086d2389a9ed989496ca63a.1606412433.git.naveen.n.rao@linux.vnet.ibm.com Cc: stable@vger.kernel.org Fixes: 763e34e74bb7d5c ("ftrace: Add register_ftrace_direct()") Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index a4020c0b4508..e1bf5228fb69 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -202,7 +202,7 @@ config DYNAMIC_FTRACE_WITH_REGS
config DYNAMIC_FTRACE_WITH_DIRECT_CALLS
def_bool y
- depends on DYNAMIC_FTRACE
+ depends on DYNAMIC_FTRACE_WITH_REGS
depends on HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
config FUNCTION_PROFILER