* [PATCH] uprobes: remove function declarations from arch/{mips,s390} [not found] <20160902081944.mcMNtGEnFezAUO5NG-TMU51RQ8M1nXmgfB5qcbw08D0@z> @ 2016-09-02 8:19 ` Marcin Nowakowski 2016-09-03 10:59 ` Heiko Carstens 0 siblings, 1 reply; 3+ messages in thread From: Marcin Nowakowski @ 2016-09-02 8:19 UTC (permalink / raw) To: linux-kernel, linux-mips, ralf, linux-s390, schwidefsky, heiko.carstens Cc: Marcin Nowakowski The declarations of arch-specific functions have been moved to a common header in commit 3820b4d2789f ('uprobes: Move function declarations out of arch'), but MIPS and S390 has added them to their own trees later. Remove the unnecessary duplicates. Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com> --- arch/mips/include/asm/uprobes.h | 12 ------------ arch/s390/include/asm/uprobes.h | 10 ---------- 2 files changed, 22 deletions(-) diff --git a/arch/mips/include/asm/uprobes.h b/arch/mips/include/asm/uprobes.h index 34c325c..28ab364 100644 --- a/arch/mips/include/asm/uprobes.h +++ b/arch/mips/include/asm/uprobes.h @@ -43,16 +43,4 @@ struct arch_uprobe_task { unsigned long saved_trap_nr; }; -extern int arch_uprobe_analyze_insn(struct arch_uprobe *aup, - struct mm_struct *mm, unsigned long addr); -extern int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs); -extern int arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs); -extern bool arch_uprobe_xol_was_trapped(struct task_struct *tsk); -extern int arch_uprobe_exception_notify(struct notifier_block *self, - unsigned long val, void *data); -extern void arch_uprobe_abort_xol(struct arch_uprobe *aup, - struct pt_regs *regs); -extern unsigned long arch_uretprobe_hijack_return_addr( - unsigned long trampoline_vaddr, struct pt_regs *regs); - #endif /* __ASM_UPROBES_H */ diff --git a/arch/s390/include/asm/uprobes.h b/arch/s390/include/asm/uprobes.h index 1411dff..658393c 100644 --- a/arch/s390/include/asm/uprobes.h +++ b/arch/s390/include/asm/uprobes.h @@ -29,14 +29,4 @@ struct arch_uprobe { struct arch_uprobe_task { }; -int arch_uprobe_analyze_insn(struct arch_uprobe *aup, struct mm_struct *mm, - unsigned long addr); -int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs); -int arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs); -bool arch_uprobe_xol_was_trapped(struct task_struct *tsk); -int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val, - void *data); -void arch_uprobe_abort_xol(struct arch_uprobe *ap, struct pt_regs *regs); -unsigned long arch_uretprobe_hijack_return_addr(unsigned long trampoline, - struct pt_regs *regs); #endif /* _ASM_UPROBES_H */ -- 2.7.4 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] uprobes: remove function declarations from arch/{mips,s390} 2016-09-02 8:19 ` [PATCH] uprobes: remove function declarations from arch/{mips,s390} Marcin Nowakowski @ 2016-09-03 10:59 ` Heiko Carstens 2016-09-08 9:52 ` Marcin Nowakowski 0 siblings, 1 reply; 3+ messages in thread From: Heiko Carstens @ 2016-09-03 10:59 UTC (permalink / raw) To: Marcin Nowakowski; +Cc: linux-kernel, linux-mips, ralf, linux-s390, schwidefsky On Fri, Sep 02, 2016 at 10:19:44AM +0200, Marcin Nowakowski wrote: > The declarations of arch-specific functions have been moved to a common > header in commit 3820b4d2789f ('uprobes: Move function declarations out of > arch'), but MIPS and S390 has added them to their own trees later. > Remove the unnecessary duplicates. > > Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com> > --- > arch/mips/include/asm/uprobes.h | 12 ------------ > arch/s390/include/asm/uprobes.h | 10 ---------- > 2 files changed, 22 deletions(-) You may either split this patch into two patches (mips/s390) so it can be applied to the different architecture trees, or send it as single patch to Andrew Morton, so he can pick it. In any case: Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com> > > diff --git a/arch/mips/include/asm/uprobes.h b/arch/mips/include/asm/uprobes.h > index 34c325c..28ab364 100644 > --- a/arch/mips/include/asm/uprobes.h > +++ b/arch/mips/include/asm/uprobes.h > @@ -43,16 +43,4 @@ struct arch_uprobe_task { > unsigned long saved_trap_nr; > }; > > -extern int arch_uprobe_analyze_insn(struct arch_uprobe *aup, > - struct mm_struct *mm, unsigned long addr); > -extern int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs); > -extern int arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs); > -extern bool arch_uprobe_xol_was_trapped(struct task_struct *tsk); > -extern int arch_uprobe_exception_notify(struct notifier_block *self, > - unsigned long val, void *data); > -extern void arch_uprobe_abort_xol(struct arch_uprobe *aup, > - struct pt_regs *regs); > -extern unsigned long arch_uretprobe_hijack_return_addr( > - unsigned long trampoline_vaddr, struct pt_regs *regs); > - > #endif /* __ASM_UPROBES_H */ > diff --git a/arch/s390/include/asm/uprobes.h b/arch/s390/include/asm/uprobes.h > index 1411dff..658393c 100644 > --- a/arch/s390/include/asm/uprobes.h > +++ b/arch/s390/include/asm/uprobes.h > @@ -29,14 +29,4 @@ struct arch_uprobe { > struct arch_uprobe_task { > }; > > -int arch_uprobe_analyze_insn(struct arch_uprobe *aup, struct mm_struct *mm, > - unsigned long addr); > -int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs); > -int arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs); > -bool arch_uprobe_xol_was_trapped(struct task_struct *tsk); > -int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val, > - void *data); > -void arch_uprobe_abort_xol(struct arch_uprobe *ap, struct pt_regs *regs); > -unsigned long arch_uretprobe_hijack_return_addr(unsigned long trampoline, > - struct pt_regs *regs); > #endif /* _ASM_UPROBES_H */ > -- > 2.7.4 > ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] uprobes: remove function declarations from arch/{mips,s390} 2016-09-03 10:59 ` Heiko Carstens @ 2016-09-08 9:52 ` Marcin Nowakowski 0 siblings, 0 replies; 3+ messages in thread From: Marcin Nowakowski @ 2016-09-08 9:52 UTC (permalink / raw) To: Andrew Morton Cc: Heiko Carstens, linux-kernel, linux-mips, ralf, linux-s390, schwidefsky Hi Andrew, On 03.09.2016 12:59, Heiko Carstens wrote: >> Signed-off-by: Marcin Nowakowski <marcin.nowakowski@imgtec.com> >> --- >> arch/mips/include/asm/uprobes.h | 12 ------------ >> arch/s390/include/asm/uprobes.h | 10 ---------- >> 2 files changed, 22 deletions(-) > > You may either split this patch into two patches (mips/s390) so it can be > applied to the different architecture trees, or send it as single patch to > Andrew Morton, so he can pick it. > > In any case: > > Acked-by: Heiko Carstens <heiko.carstens@de.ibm.com> Could you please pick up this patch and take it through your tree? It's trivial and shouldn't cause any conflicts for the arch trees, so I think it's simpler to keep it as one. thanks, Marcin >> >> diff --git a/arch/mips/include/asm/uprobes.h b/arch/mips/include/asm/uprobes.h >> index 34c325c..28ab364 100644 >> --- a/arch/mips/include/asm/uprobes.h >> +++ b/arch/mips/include/asm/uprobes.h >> @@ -43,16 +43,4 @@ struct arch_uprobe_task { >> unsigned long saved_trap_nr; >> }; >> >> -extern int arch_uprobe_analyze_insn(struct arch_uprobe *aup, >> - struct mm_struct *mm, unsigned long addr); >> -extern int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs); >> -extern int arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs); >> -extern bool arch_uprobe_xol_was_trapped(struct task_struct *tsk); >> -extern int arch_uprobe_exception_notify(struct notifier_block *self, >> - unsigned long val, void *data); >> -extern void arch_uprobe_abort_xol(struct arch_uprobe *aup, >> - struct pt_regs *regs); >> -extern unsigned long arch_uretprobe_hijack_return_addr( >> - unsigned long trampoline_vaddr, struct pt_regs *regs); >> - >> #endif /* __ASM_UPROBES_H */ >> diff --git a/arch/s390/include/asm/uprobes.h b/arch/s390/include/asm/uprobes.h >> index 1411dff..658393c 100644 >> --- a/arch/s390/include/asm/uprobes.h >> +++ b/arch/s390/include/asm/uprobes.h >> @@ -29,14 +29,4 @@ struct arch_uprobe { >> struct arch_uprobe_task { >> }; >> >> -int arch_uprobe_analyze_insn(struct arch_uprobe *aup, struct mm_struct *mm, >> - unsigned long addr); >> -int arch_uprobe_pre_xol(struct arch_uprobe *aup, struct pt_regs *regs); >> -int arch_uprobe_post_xol(struct arch_uprobe *aup, struct pt_regs *regs); >> -bool arch_uprobe_xol_was_trapped(struct task_struct *tsk); >> -int arch_uprobe_exception_notify(struct notifier_block *self, unsigned long val, >> - void *data); >> -void arch_uprobe_abort_xol(struct arch_uprobe *ap, struct pt_regs *regs); >> -unsigned long arch_uretprobe_hijack_return_addr(unsigned long trampoline, >> - struct pt_regs *regs); >> #endif /* _ASM_UPROBES_H */ >> -- >> 2.7.4 >> > ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-09-08 9:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20160902081944.mcMNtGEnFezAUO5NG-TMU51RQ8M1nXmgfB5qcbw08D0@z>
2016-09-02 8:19 ` [PATCH] uprobes: remove function declarations from arch/{mips,s390} Marcin Nowakowski
2016-09-03 10:59 ` Heiko Carstens
2016-09-08 9:52 ` Marcin Nowakowski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox