/[packages]/cauldron/kernel/current/SOURCES/0144-ftrace-Fix-DYNAMIC_FTRACE_WITH_DIRECT_CALLS-dependen.patch
ViewVC logotype

Contents of /cauldron/kernel/current/SOURCES/0144-ftrace-Fix-DYNAMIC_FTRACE_WITH_DIRECT_CALLS-dependen.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1652305 - (show annotations) (download)
Thu Dec 3 22:03:37 2020 UTC (3 years, 4 months ago) by tmb
File size: 1193 byte(s)
add upstream post -rc6 fixes
1 From 49a962c075dfa41c78e34784772329bc8784d217 Mon Sep 17 00:00:00 2001
2 From: "Naveen N. Rao" <naveen.n.rao@linux.vnet.ibm.com>
3 Date: Thu, 26 Nov 2020 23:38:39 +0530
4 Subject: [PATCH 144/150] ftrace: Fix DYNAMIC_FTRACE_WITH_DIRECT_CALLS
5 dependency
6
7 DYNAMIC_FTRACE_WITH_DIRECT_CALLS should depend on
8 DYNAMIC_FTRACE_WITH_REGS since we need ftrace_regs_caller().
9
10 Link: https://lkml.kernel.org/r/fc4b257ea8689a36f086d2389a9ed989496ca63a.1606412433.git.naveen.n.rao@linux.vnet.ibm.com
11
12 Cc: stable@vger.kernel.org
13 Fixes: 763e34e74bb7d5c ("ftrace: Add register_ftrace_direct()")
14 Signed-off-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
15 Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
16 ---
17 kernel/trace/Kconfig | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20 diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
21 index a4020c0b4508..e1bf5228fb69 100644
22 --- a/kernel/trace/Kconfig
23 +++ b/kernel/trace/Kconfig
24 @@ -202,7 +202,7 @@ config DYNAMIC_FTRACE_WITH_REGS
25
26 config DYNAMIC_FTRACE_WITH_DIRECT_CALLS
27 def_bool y
28 - depends on DYNAMIC_FTRACE
29 + depends on DYNAMIC_FTRACE_WITH_REGS
30 depends on HAVE_DYNAMIC_FTRACE_WITH_DIRECT_CALLS
31
32 config FUNCTION_PROFILER
33 --
34 2.29.2
35

  ViewVC Help
Powered by ViewVC 1.1.30