summaryrefslogtreecommitdiffstats
path: root/kernel/torture.c
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2021-06-28 13:24:12 +0200
committerIngo Molnar <mingo@kernel.org>2021-07-05 10:47:16 +0200
commitfa68bd09fc62240a383c0c601d3349c47db10c34 (patch)
tree2cd9362e57b77cab1143a0c7d15216ba39d53970 /kernel/torture.c
parentstatic_call: Fix static_call_text_reserved() vs __init (diff)
downloadlinux-fa68bd09fc62240a383c0c601d3349c47db10c34.tar.xz
linux-fa68bd09fc62240a383c0c601d3349c47db10c34.zip
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>
Diffstat (limited to 'kernel/torture.c')
0 files changed, 0 insertions, 0 deletions