From patchwork Wed Nov 27 02:53:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 21787 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f199.google.com (mail-pd0-f199.google.com [209.85.192.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D76D5202DA for ; Wed, 27 Nov 2013 02:53:42 +0000 (UTC) Received: by mail-pd0-f199.google.com with SMTP id r10sf16210089pdi.6 for ; Tue, 26 Nov 2013 18:53:42 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version: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=BAy/5llTlmq6HDRGp/1ap4iqytQ/Vncuh83+96SYX/s=; b=f/obc8YzYaSYbpKAxIK2xTzn/9pqFoMiVOhqGyJlSsM2joPsUdKhYn3aDGvr5ViDeN qC0yFSJN+8brJ4d7eX2bDqMZZbO9YASsFonr1Q/9Tk59Grn/j6wYtHgq1XTVYcrjR6R+ zsAVIUV2WZWz5vRhsQpuC4xX4xmqtn0nh+SmAOIfiwWaJbzU9QCF4HOrWTPq8LWDF8xA ZbpRn2wEXMPGsYSSjOrfSlADD5Hz4dKCInC8dtBodBaeC0RTlQ1+OYq9rNeeQHoiy3bZ yYTRDQDCXwSiit4SsviNM/eYGP5FH2qXiPhbiovvDU3blYsRuWPBZ4OCHgmOULFbaZhn H3Bw== X-Gm-Message-State: ALoCoQlgaQVSrC18QJD5dx0GjT1EQQ9Kci69fIQKLSKY+2hFSILi4IlTfTrv93IWOlsBgqthiGeo X-Received: by 10.66.102.8 with SMTP id fk8mr3192189pab.24.1385520821890; Tue, 26 Nov 2013 18:53:41 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.4.138 with SMTP id k10ls2816971qek.13.gmail; Tue, 26 Nov 2013 18:53:41 -0800 (PST) X-Received: by 10.58.11.169 with SMTP id r9mr229297veb.52.1385520821742; Tue, 26 Nov 2013 18:53:41 -0800 (PST) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id tg7si1636068vdc.139.2013.11.26.18.53.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Nov 2013 18:53:41 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.179 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.179; Received: by mail-ve0-f179.google.com with SMTP id jw12so4782362veb.10 for ; Tue, 26 Nov 2013 18:53:41 -0800 (PST) X-Received: by 10.58.228.231 with SMTP id sl7mr229937vec.49.1385520821602; Tue, 26 Nov 2013 18:53:41 -0800 (PST) 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 u4csp254124vcz; Tue, 26 Nov 2013 18:53:41 -0800 (PST) X-Received: by 10.224.53.65 with SMTP id l1mr57179296qag.4.1385520821146; Tue, 26 Nov 2013 18:53:41 -0800 (PST) Received: from mail-qa0-f51.google.com (mail-qa0-f51.google.com [209.85.216.51]) by mx.google.com with ESMTPS id w7si12780090qeg.114.2013.11.26.18.53.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Nov 2013 18:53:41 -0800 (PST) Received-SPF: neutral (google.com: 209.85.216.51 is neither permitted nor denied by best guess record for domain of dave.long@linaro.org) client-ip=209.85.216.51; Received: by mail-qa0-f51.google.com with SMTP id o15so9621186qap.17 for ; Tue, 26 Nov 2013 18:53:41 -0800 (PST) X-Received: by 10.49.52.102 with SMTP id s6mr26400939qeo.60.1385520820967; Tue, 26 Nov 2013 18:53:40 -0800 (PST) Received: from localhost.localdomain (pool-72-71-243-183.cncdnh.fast00.myfairpoint.net. [72.71.243.183]) by mx.google.com with ESMTPSA id fc16sm56880235qeb.3.2013.11.26.18.53.38 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 26 Nov 2013 18:53:39 -0800 (PST) From: David Long To: linux-arm-kernel@lists.infradead.org, Russell King Cc: Rabin Vincent , "Jon Medhurst (Tixy)" , Oleg Nesterov , Srikar Dronamraju , Ingo Molnar , Masami Hiramatsu , Ananth N Mavinakayanahalli , Anil S Keshavamurthy , , Peter Zijlstra , Paul Mackerras , Arnaldo Carvalho de Melo , linux-kernel@vger.kernel.org Subject: [PATCH v3 02/15] ARM: move shared uprobe/kprobe definitions into new include file Date: Tue, 26 Nov 2013 21:53:21 -0500 Message-Id: <1385520814-10663-3-git-send-email-dave.long@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1385520814-10663-1-git-send-email-dave.long@linaro.org> References: <1385520814-10663-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.128.179 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" Separate the kprobe-only definitions from the definitions needed by both kprobes and uprobes. Signed-off-by: David A. Long --- arch/arm/include/asm/kprobes.h | 15 +-------------- arch/arm/include/asm/probes.h | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 arch/arm/include/asm/probes.h diff --git a/arch/arm/include/asm/kprobes.h b/arch/arm/include/asm/kprobes.h index f82ec22..30fc11b 100644 --- a/arch/arm/include/asm/kprobes.h +++ b/arch/arm/include/asm/kprobes.h @@ -28,21 +28,8 @@ #define kretprobe_blacklist_size 0 typedef u32 kprobe_opcode_t; - struct kprobe; -typedef void (kprobe_insn_handler_t)(struct kprobe *, struct pt_regs *); -typedef unsigned long (kprobe_check_cc)(unsigned long); -typedef void (kprobe_insn_singlestep_t)(struct kprobe *, struct pt_regs *); -typedef void (kprobe_insn_fn_t)(void); - -/* Architecture specific copy of original instruction. */ -struct arch_specific_insn { - kprobe_opcode_t *insn; - kprobe_insn_handler_t *insn_handler; - kprobe_check_cc *insn_check_cc; - kprobe_insn_singlestep_t *insn_singlestep; - kprobe_insn_fn_t *insn_fn; -}; +#include struct prev_kprobe { struct kprobe *kp; diff --git a/arch/arm/include/asm/probes.h b/arch/arm/include/asm/probes.h new file mode 100644 index 0000000..21da148 --- /dev/null +++ b/arch/arm/include/asm/probes.h @@ -0,0 +1,18 @@ +#ifndef _ASM_PROBES_H +#define _ASM_PROBES_H + +typedef void (kprobe_insn_handler_t)(struct kprobe *, struct pt_regs *); +typedef unsigned long (kprobe_check_cc)(unsigned long); +typedef void (kprobe_insn_singlestep_t)(struct kprobe *, struct pt_regs *); +typedef void (kprobe_insn_fn_t)(void); + +/* Architecture specific copy of original instruction. */ +struct arch_specific_insn { + kprobe_opcode_t *insn; + kprobe_insn_handler_t *insn_handler; + kprobe_check_cc *insn_check_cc; + kprobe_insn_singlestep_t *insn_singlestep; + kprobe_insn_fn_t *insn_fn; +}; + +#endif