Hi,
On Fri, May 08, 2020 at 10:07:24PM +0800, YueHaibing wrote:
> commit 657480d9c015 ("s390: support KPROBES_ON_FTRACE")
> left behind this, remove it.
>
> Signed-off-by: YueHaibing <yuehaibing@xxxxxxxxxx>
> ---
> arch/s390/kernel/ftrace.c | 16 ----------------
> 1 file changed, 16 deletions(-)
>
> diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
> index 4cd9b1ada834..44e01dd1e624 100644
> --- a/arch/s390/kernel/ftrace.c
> +++ b/arch/s390/kernel/ftrace.c
> @@ -72,22 +72,6 @@ static inline void ftrace_generate_orig_insn(struct ftrace_insn *insn)
> #endif
> }
>
> -static inline void ftrace_generate_kprobe_nop_insn(struct ftrace_insn *insn)
> -{
> -#ifdef CONFIG_KPROBES
> - insn->opc = BREAKPOINT_INSTRUCTION;
> - insn->disp = KPROBE_ON_FTRACE_NOP;
> -#endif
> -}
> -
> -static inline void ftrace_generate_kprobe_call_insn(struct ftrace_insn *insn)
> -{
> -#ifdef CONFIG_KPROBES
> - insn->opc = BREAKPOINT_INSTRUCTION;
> - insn->disp = KPROBE_ON_FTRACE_CALL;
> -#endif
> -}
> -
> int ftrace_modify_call(struct dyn_ftrace *rec, unsigned long old_addr,
> unsigned long addr)
> {
> --
> 2.17.1
Thanks for noticing, looks like i missed them.
Acked-by: Sven Schnelle <svens@xxxxxxxxxxxxx>
Sven
