From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753986AbcICLBS (ORCPT ); Sat, 3 Sep 2016 07:01:18 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:43393 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753268AbcICLBR (ORCPT ); Sat, 3 Sep 2016 07:01:17 -0400 X-IBM-Helo: d06dlp02.portsmouth.uk.ibm.com X-IBM-MailFrom: heiko.carstens@de.ibm.com X-IBM-RcptTo: linux-kernel@vger.kernel.org;linux-s390@vger.kernel.org Date: Sat, 3 Sep 2016 12:59:28 +0200 From: Heiko Carstens To: Marcin Nowakowski Cc: linux-kernel@vger.kernel.org, linux-mips@linux-mips.org, ralf@linux-mips.org, linux-s390@vger.kernel.org, schwidefsky@de.ibm.com Subject: Re: [PATCH] uprobes: remove function declarations from arch/{mips,s390} References: <1472804384-17830-1-git-send-email-marcin.nowakowski@imgtec.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1472804384-17830-1-git-send-email-marcin.nowakowski@imgtec.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16090310-0020-0000-0000-0000023D5438 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16090310-0021-0000-0000-00003DE6A375 Message-Id: <20160903105928.GB3917@osiris> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-09-03_07:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1609030158 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > --- > 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 > > 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 >