summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorMichael Ellerman <mpe@ellerman.id.au>2022-12-08 23:57:47 +1100
committerMichael Ellerman <mpe@ellerman.id.au>2022-12-08 23:57:47 +1100
commitf24f21c4122e837fa031cc512a7f20eb8c554c5e (patch)
treeb19acb396850fbfb36218329659b926446c24914 /kernel
parent64fdcbcc064966bbf261bb455876dffa58858d32 (diff)
parenta39818a3fb2bf12ae945a7c5fba8c5d9048a0e96 (diff)
Merge branch 'topic/objtool' into next
Merge the powerpc objtool support, which we were keeping in a topic branch in case of any merge conflicts.
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index e9e95c790b8ee..2b782321376ac 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