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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:02:27 +0000 (16:02 +0200)
commit1dc6cd71e05d4fc7b3e77741768798fb22798909
tree5d9f45999762ba68c9a3710acc907989f614d91a
parent80f755926a7e3bb00ff69ee12232b33a473dfc27
kprobe/static_call: Restore missing static_call_text_reserved()

[ Upstream commit fa68bd09fc62240a383c0c601d3349c47db10c34 ]

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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
kernel/kprobes.c