mirror of
https://github.com/torvalds/linux.git
synced 2026-01-25 15:03:52 +08:00
Resolve structural conflict between:59566b0b62: ("x86/ftrace: Have ftrace trampolines turn read-only at the end of system boot up") which introduced a new reference to 'ftrace_epilogue', and:0298739b79: ("x86,ftrace: Fix ftrace_regs_caller() unwind") Which renamed it to 'ftrace_caller_end'. Rename the new usage site in the merge commit. Signed-off-by: Ingo Molnar <mingo@kernel.org>