From patchwork Tue Oct 15 21:04:16 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 21046 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9487520D84 for ; Tue, 15 Oct 2013 21:04:34 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id j10sf9551323oah.5 for ; Tue, 15 Oct 2013 14:04:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=nRUbv99aQQ9S3cLnEOsb08Ws//EUSxgKjZDq0ajGrx0=; b=WjdyAcDrf//XkG3tQve18hjxB+CxckB3oS77c3cyU4QSPvA4LPmW84hPcLvcOjvicr JcMXtiMf95+A8wwQb4Mb2zh78he908tI/r2tZ0oqRyg63wnqNT0cP6C46hZmmQrMGaGq o0IiNx8uCvsVv7++qgVg2lk3RQznyUWxrQy97F9nKl1VPnSATh2U7wKyJMIM3PI5w4vJ cWM9mDlJqBgqF/LQ1krmx9w5gTVhzqW7I3IJtpiZfr/KNqygSeN9y5aOLiUZf2WFKYS5 cqPTTfmODsMSs44AKGIKldaLzzu9mr3pNpEgq2WuEzW/Xoq9+nLRlFPYDtFCeTveF6ep OTqw== X-Received: by 10.182.220.170 with SMTP id px10mr14274514obc.35.1381871074210; Tue, 15 Oct 2013 14:04:34 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.82.229 with SMTP id l5ls295986qey.11.gmail; Tue, 15 Oct 2013 14:04:34 -0700 (PDT) X-Received: by 10.220.105.199 with SMTP id u7mr40618528vco.1.1381871074080; Tue, 15 Oct 2013 14:04:34 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id sc5si23424637vdc.139.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 14:04:33 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id ia6so4466041vcb.20 for ; Tue, 15 Oct 2013 14:04:33 -0700 (PDT) X-Gm-Message-State: ALoCoQnUy1L8CWCBC2UvO1xvXlxKXxq5vXM7bMYJ4E9DoQ15zfoJjnBqQYtMukKwoQJQ2iHZa/z+ X-Received: by 10.52.157.232 with SMTP id wp8mr34884792vdb.4.1381871073815; Tue, 15 Oct 2013 14:04:33 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp328404vcz; Tue, 15 Oct 2013 14:04:33 -0700 (PDT) X-Received: by 10.224.8.10 with SMTP id f10mr46175798qaf.29.1381871072857; Tue, 15 Oct 2013 14:04:32 -0700 (PDT) Received: from mail-qa0-f45.google.com (mail-qa0-f45.google.com [209.85.216.45]) by mx.google.com with ESMTPS id fb5si14697697qcb.42.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 14:04:32 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.216.45 is neither permitted nor denied by best guess record for domain of dave.long@linaro.org) client-ip=209.85.216.45; Received: by mail-qa0-f45.google.com with SMTP id ii20so3611446qab.18 for ; Tue, 15 Oct 2013 14:04:32 -0700 (PDT) X-Received: by 10.49.98.1 with SMTP id ee1mr12467469qeb.28.1381871072583; Tue, 15 Oct 2013 14:04:32 -0700 (PDT) Received: from localhost.localdomain (pool-72-71-243-183.cncdnh.fast00.myfairpoint.net. [72.71.243.183]) by mx.google.com with ESMTPSA id i4sm159645128qan.0.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 14:04:32 -0700 (PDT) From: David Long To: linux-arm-kernel@lists.infradead.org Cc: Rabin Vincent , "Jon Medhurst (Tixy)" , Oleg Nesterov , Srikar Dronamraju , Ingo Molnar , linux-kernel@vger.kernel.org Subject: [PATCH v2 01/13] uprobes: move function declarations out of arch Date: Tue, 15 Oct 2013 17:04:16 -0400 Message-Id: <1381871068-27660-2-git-send-email-dave.long@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1381871068-27660-1-git-send-email-dave.long@linaro.org> References: <1381871068-27660-1-git-send-email-dave.long@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: dave.long@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.175 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: "David A. Long" Move the function declarations from the arch header to the common header, since only the function bodies are architecture-specific. These changes are from Vincent Rabin's uprobes patch. Signed-off-by: Rabin Vincent Signed-off-by: David A. Long --- arch/x86/include/asm/uprobes.h | 7 ------- include/linux/uprobes.h | 8 ++++++++ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/x86/include/asm/uprobes.h b/arch/x86/include/asm/uprobes.h index 6e51979..b20b4d6 100644 --- a/arch/x86/include/asm/uprobes.h +++ b/arch/x86/include/asm/uprobes.h @@ -49,11 +49,4 @@ struct arch_uprobe_task { unsigned int saved_tf; }; -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/include/linux/uprobes.h b/include/linux/uprobes.h index 06f28be..9fd60c5 100644 --- a/include/linux/uprobes.h +++ b/include/linux/uprobes.h @@ -30,6 +30,7 @@ struct vm_area_struct; struct mm_struct; struct inode; +struct notifier_block; #ifdef CONFIG_ARCH_SUPPORTS_UPROBES # include @@ -125,6 +126,13 @@ extern void uprobe_notify_resume(struct pt_regs *regs); extern bool uprobe_deny_signal(void); extern bool __weak arch_uprobe_skip_sstep(struct arch_uprobe *aup, struct pt_regs *regs); extern void uprobe_clear_state(struct mm_struct *mm); +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); #else /* !CONFIG_UPROBES */ struct uprobes_state { };