diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2021-06-28 13:24:12 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-20 16:00:41 +0200 |
| commit | 8be9eadd7bd646a0dd35754f5f64a57ee3bb544b (patch) | |
| tree | 40fe1b0d9af5e7a0db32c77e6776ba2ceee72920 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | fda47dd9f5d7a026f4eae3cc249b69f695df2182 (diff) | |
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>
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions