]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
kprobe/static_call: Restore missing static_call_text_reserved()
authorPeter Zijlstra <peterz@infradead.org>
Mon, 28 Jun 2021 11:24:12 +0000 (13:24 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 5 Jul 2021 08:47:16 +0000 (10:47 +0200)
commitfa68bd09fc62240a383c0c601d3349c47db10c34
tree2cd9362e57b77cab1143a0c7d15216ba39d53970
parent2bee6d16e4379326b1eea454e68c98b17456769e
kprobe/static_call: Restore missing static_call_text_reserved()

Restore two hunks from commit:

  6333e8f73b83 ("static_call: Avoid kprobes on inline static_call()s")

that went walkabout in a Git merge commit.

Fixes: 76d4acf22b48 ("Merge tag 'perf-kprobes-2020-12-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip")
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
Link: https://lore.kernel.org/r/20210628113045.167127609@infradead.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
kernel/kprobes.c