summaryrefslogtreecommitdiff
path: root/kernel/trace
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2022-12-19 12:27:25 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2022-12-19 12:27:25 -0300
commit30d647f5ba9ebefa153ad2bc3f05e3a7c7d90d1c (patch)
tree418c535ebc1a0001b7c448e1d7ff97cf79bff8fd /kernel/trace
parent66dfc517e8ec530b1d8d4776c05e3f264f38ecb8 (diff)
parentaeba12b26c79fc35e07e511f692a8907037d95da (diff)
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index e95c8fe478cd..197545241ab8 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -82,6 +82,13 @@ config HAVE_OBJTOOL_MCOUNT
help
Arch supports objtool --mcount
+config HAVE_OBJTOOL_NOP_MCOUNT
+ bool
+ help
+ Arch supports the objtool options --mcount with --mnop.
+ An architecture can select this if it wants to enable nop'ing
+ of ftrace locations.
+
config HAVE_C_RECORDMCOUNT
bool
help