From patchwork Mon Dec 16 04:08:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 22489 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6AABA23FE5 for ; Mon, 16 Dec 2013 04:08:59 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id lx4sf16462635iec.10 for ; Sun, 15 Dec 2013 20:08:59 -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=k7tqtLutSUmjz8l2uCA59PqW3D6/Z2JTiUu1HWyxxJNt5/a5G9xMaba/umgMASdNth Zu2XZwIs3hEwvf/icPwRRr3EX2zZnoeLMyW41aWODFX2ENaaMg/3EEumu3ydeKXNMDYN 3tyQ0aqsLTi59a9HBjdPeYjCGAtuZi78m51CFsVc3ZI6EwuvvYEydRKyqY+xaKA9C6QU 4xE5+bjKncVatfgDFZbDbAkLb78mwGP3RhLW88K+mIx1dO8KmLusw0RJ2CxyGqhfeYeL p/pyNFzktoiaLjwwv3GcOQyL/FAhNai0iG6i6tnWe+L/7A/8Mq00AJTFWD3hsAMqpmnI TGMQ== X-Gm-Message-State: ALoCoQme3ZXf9EuaQ0HuoalWRbUvLzWkaBMdDzitJUXEnqSY9+uencPVgWvUwZ+wl/oqc3++DOvK X-Received: by 10.182.111.134 with SMTP id ii6mr138572obb.38.1387166939093; Sun, 15 Dec 2013 20:08:59 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.17.65 with SMTP id m1ls1907826qed.91.gmail; Sun, 15 Dec 2013 20:08:59 -0800 (PST) X-Received: by 10.52.168.106 with SMTP id zv10mr6369187vdb.21.1387166938972; Sun, 15 Dec 2013 20:08:58 -0800 (PST) Received: from mail-ve0-f171.google.com (mail-ve0-f171.google.com [209.85.128.171]) by mx.google.com with ESMTPS id gx6si3637996vdc.89.2013.12.15.20.08.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 15 Dec 2013 20:08:58 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.171 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.171; Received: by mail-ve0-f171.google.com with SMTP id pa12so2908586veb.2 for ; Sun, 15 Dec 2013 20:08:58 -0800 (PST) X-Received: by 10.52.52.137 with SMTP id t9mr6257650vdo.22.1387166938897; Sun, 15 Dec 2013 20:08:58 -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 u4csp69916vcz; Sun, 15 Dec 2013 20:08:58 -0800 (PST) X-Received: by 10.224.72.15 with SMTP id k15mr28526987qaj.58.1387166938558; Sun, 15 Dec 2013 20:08:58 -0800 (PST) Received: from mail-qe0-f51.google.com (mail-qe0-f51.google.com [209.85.128.51]) by mx.google.com with ESMTPS id j7si10557808qab.167.2013.12.15.20.08.58 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 15 Dec 2013 20:08:58 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.51 is neither permitted nor denied by best guess record for domain of dave.long@linaro.org) client-ip=209.85.128.51; Received: by mail-qe0-f51.google.com with SMTP id 1so3422782qee.24 for ; Sun, 15 Dec 2013 20:08:58 -0800 (PST) X-Received: by 10.49.109.200 with SMTP id hu8mr28903361qeb.72.1387166938404; Sun, 15 Dec 2013 20:08:58 -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 hb2sm36013890qeb.6.2013.12.15.20.08.56 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 15 Dec 2013 20:08:57 -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 v4 02/16] ARM: move shared uprobe/kprobe definitions into new include file Date: Sun, 15 Dec 2013 23:08:36 -0500 Message-Id: <1387166930-13182-3-git-send-email-dave.long@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1387166930-13182-1-git-send-email-dave.long@linaro.org> References: <1387166930-13182-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.171 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