From patchwork Tue Oct 15 21:04: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: 21051 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D69AE20D84 for ; Tue, 15 Oct 2013 21:04:40 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id v1sf19282874yhn.4 for ; Tue, 15 Oct 2013 14:04:40 -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=BAy/5llTlmq6HDRGp/1ap4iqytQ/Vncuh83+96SYX/s=; b=jPB4CUi2WDAd7/If60Hjeb63KTKENLfYUw5ssVBaQQV+G1Pl88clLCXxba5ctBrMRE LwNuXok9Cw7efpai2UKwSOFjsUS3ybdbAkrt0RF6IvHajv9PCVsLS0tcK3ST41Kauaq2 KS5QCCv1A3ZGnOMV++LqMvdogNG0lfUw1tZw8WkFGl+lGFzYjmj/gZMEh/3oG7EuZkCZ 1HHasf4OtwaYT6/yAuJ9TZY8YO7enxhzQzBRFli6AY+1hOZb9FvNfEr4XjGfyDn4r09p a+1+lka6Jb/RDHu19IFqUicsC3oofJnCbnQzdwbqYZYjGIqq1Xvjcd3VE3mDl1CQNKnh 0nmg== X-Received: by 10.236.176.1 with SMTP id a1mr40494617yhm.10.1381871080630; Tue, 15 Oct 2013 14:04:40 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.35.244 with SMTP id l20ls313728qej.98.gmail; Tue, 15 Oct 2013 14:04:40 -0700 (PDT) X-Received: by 10.52.116.74 with SMTP id ju10mr7045184vdb.20.1381871080516; Tue, 15 Oct 2013 14:04:40 -0700 (PDT) Received: from mail-vb0-f54.google.com (mail-vb0-f54.google.com [209.85.212.54]) by mx.google.com with ESMTPS id fb5si23457603vcb.90.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 14:04:40 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.54 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.54; Received: by mail-vb0-f54.google.com with SMTP id q14so5586794vbe.13 for ; Tue, 15 Oct 2013 14:04:40 -0700 (PDT) X-Gm-Message-State: ALoCoQnBXqtsKxa13+ihcSX85FXFvR33OrETPR0hwr2nHb4KxboMvHu+lsKNLQFKEOgDdSE8R5Kg X-Received: by 10.220.58.1 with SMTP id e1mr21076731vch.0.1381871080423; Tue, 15 Oct 2013 14:04:40 -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 u4csp328420vcz; Tue, 15 Oct 2013 14:04:40 -0700 (PDT) X-Received: by 10.224.167.16 with SMTP id o16mr32509628qay.58.1381871080028; Tue, 15 Oct 2013 14:04:40 -0700 (PDT) Received: from mail-qc0-f176.google.com (mail-qc0-f176.google.com [209.85.216.176]) by mx.google.com with ESMTPS id t4si22294150qap.106.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 15 Oct 2013 14:04:40 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.216.176 is neither permitted nor denied by best guess record for domain of dave.long@linaro.org) client-ip=209.85.216.176; Received: by mail-qc0-f176.google.com with SMTP id t7so6561384qcv.35 for ; Tue, 15 Oct 2013 14:04:39 -0700 (PDT) X-Received: by 10.49.121.134 with SMTP id lk6mr24414598qeb.29.1381871079790; Tue, 15 Oct 2013 14:04:39 -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:38 -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 06/13] ARM: move shared uprobe/kprobe definitions into new include file Date: Tue, 15 Oct 2013 17:04:21 -0400 Message-Id: <1381871068-27660-7-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.212.54 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