[PATCH -next] s390: Remove two unused inline functions

[PATCH -next] s390: Remove two unused inline functions

[YueHaibing]

commit 657480d9c015 ("s390: support KPROBES_ON_FTRACE")
left behind this, remove it.

Signed-off-by: YueHaibing <yuehaibing@huawei.com>
---
 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

Re: [PATCH -next] s390: Remove two unused inline functions

[Sven Schnelle]

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@huawei.com>
> ---
>  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@linux.ibm.com>

Sven

Re: [PATCH -next] s390: Remove two unused inline functions

[Steven Rostedt]

On Mon, 11 May 2020 08:07:51 +0200
Sven Schnelle <svens@linux.ibm.com> wrote:

> Thanks for noticing, looks like i missed them.
> 
> Acked-by: Sven Schnelle <svens@linux.ibm.com>

As this is s390 specific, will it be going through the s390 repo?

-- Steve

Re: [PATCH -next] s390: Remove two unused inline functions

[Christian Borntraeger]

On 11.05.20 22:17, Steven Rostedt wrote:
> On Mon, 11 May 2020 08:07:51 +0200
> Sven Schnelle <svens@linux.ibm.com> wrote:
> 
>> Thanks for noticing, looks like i missed them.
>>
>> Acked-by: Sven Schnelle <svens@linux.ibm.com>
> 
> As this is s390 specific, will it be going through the s390 repo?

Yes. 
I will pick this up. Vasily will then take care of it.

Re: [PATCH -next] s390: Remove two unused inline functions

[Christian Borntraeger]

On 08.05.20 16:07, YueHaibing wrote:
> commit 657480d9c015 ("s390: support KPROBES_ON_FTRACE")
> left behind this, remove it.
> 
> Signed-off-by: YueHaibing <yuehaibing@huawei.com>
> ---
>  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)
>  {
> 

thanks, applied.

Re: [PATCH -next] s390: Remove two unused inline functions

[Joe Perches]

On Mon, 2020-05-11 at 22:27 +0200, Christian Borntraeger wrote:
> On 11.05.20 22:17, Steven Rostedt wrote:
> > On Mon, 11 May 2020 08:07:51 +0200
> > Sven Schnelle <svens@linux.ibm.com> wrote:
> > 
> > > Thanks for noticing, looks like i missed them.
> > > 
> > > Acked-by: Sven Schnelle <svens@linux.ibm.com>
> > 
> > As this is s390 specific, will it be going through the s390 repo?
> 
> Yes. 
> I will pick this up. Vasily will then take care of it.

Awhile back, I posted a list of apparently unused static inline
functions in .h files treewide found by a script:

https://lore.kernel.org/lkml/4603e761a5f39f4d97375e1e08d20d720c526341.camel@perches.com/

Here are the s390 entries:

arch/s390/include/asm/atomic_ops.h:138:static inline long __atomic64_cmpxchg_bool(long *ptr, long old, long new)
arch/s390/include/asm/bitops.h:278:static inline void __set_bit_inv(unsigned long nr, volatile unsigned long *ptr)
arch/s390/include/asm/bitops.h:283:static inline void __clear_bit_inv(unsigned long nr, volatile unsigned long *ptr)
arch/s390/include/asm/cpu_mcf.h:106:static inline int kernel_cpumcf_begin(void)
arch/s390/include/asm/cpu_mcf.h:114:static inline void kernel_cpumcf_end(void)
arch/s390/include/asm/ftrace.h:64:static inline int is_ftrace_nop(struct ftrace_insn *insn)
arch/s390/include/asm/kvm_para.h:146:static inline long kvm_hypercall5(unsigned long nr, unsigned long p1,
arch/s390/include/asm/kvm_para.h:175:static inline long kvm_hypercall6(unsigned long nr, unsigned long p1,
arch/s390/include/asm/pci_dma.h:134:static inline void invalidate_table_entry(unsigned long *entry)
arch/s390/include/asm/pci_dma.h:176:static inline int entry_isprotected(unsigned long entry)
arch/s390/include/asm/timex.h:52:static inline void store_clock_comparator(__u64 *time)

Re: [PATCH -next] s390: Remove two unused inline functions

[Sven Schnelle]

Hi Joe,

On Mon, May 11, 2020 at 01:38:57PM -0700, Joe Perches wrote:

> Awhile back, I posted a list of apparently unused static inline
> functions in .h files treewide found by a script:
> 
> https://lore.kernel.org/lkml/4603e761a5f39f4d97375e1e08d20d720c526341.camel@perches.com/
> 
> Here are the s390 entries:
> 
> arch/s390/include/asm/atomic_ops.h:138:static inline long __atomic64_cmpxchg_bool(long *ptr, long old, long new)
> arch/s390/include/asm/bitops.h:278:static inline void __set_bit_inv(unsigned long nr, volatile unsigned long *ptr)
> arch/s390/include/asm/bitops.h:283:static inline void __clear_bit_inv(unsigned long nr, volatile unsigned long *ptr)
> arch/s390/include/asm/cpu_mcf.h:106:static inline int kernel_cpumcf_begin(void)
> arch/s390/include/asm/cpu_mcf.h:114:static inline void kernel_cpumcf_end(void)
> arch/s390/include/asm/ftrace.h:64:static inline int is_ftrace_nop(struct ftrace_insn *insn)
> arch/s390/include/asm/kvm_para.h:146:static inline long kvm_hypercall5(unsigned long nr, unsigned long p1,
> arch/s390/include/asm/kvm_para.h:175:static inline long kvm_hypercall6(unsigned long nr, unsigned long p1,
> arch/s390/include/asm/pci_dma.h:134:static inline void invalidate_table_entry(unsigned long *entry)
> arch/s390/include/asm/pci_dma.h:176:static inline int entry_isprotected(unsigned long entry)
> arch/s390/include/asm/timex.h:52:static inline void store_clock_comparator(__u64 *time)

Thanks, i take a look and prepare a patch.

Regards
Sven