From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422652Ab3LTMrX (ORCPT ); Fri, 20 Dec 2013 07:47:23 -0500 Received: from smarthost01d.mail.zen.net.uk ([212.23.1.7]:42140 "EHLO smarthost01d.mail.zen.net.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932519Ab3LTMrD (ORCPT ); Fri, 20 Dec 2013 07:47:03 -0500 Message-ID: <1387543568.3404.36.camel@linaro1.home> Subject: Re: [PATCH v4 02/16] ARM: move shared uprobe/kprobe definitions into new include file From: "Jon Medhurst (Tixy)" To: David Long Cc: linux-arm-kernel@lists.infradead.org, Russell King , Rabin Vincent , Oleg Nesterov , Srikar Dronamraju , Ingo Molnar , Masami Hiramatsu , Ananth N Mavinakayanahalli , Anil S Keshavamurthy , davem@davemloft.net, Peter Zijlstra , Paul Mackerras , Arnaldo Carvalho de Melo , linux-kernel@vger.kernel.org Date: Fri, 20 Dec 2013 12:46:08 +0000 In-Reply-To: <1387166930-13182-3-git-send-email-dave.long@linaro.org> References: <1387166930-13182-1-git-send-email-dave.long@linaro.org> <1387166930-13182-3-git-send-email-dave.long@linaro.org> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.4.4-3 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Originating-smarthost01d-IP: [82.69.122.217] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, 2013-12-15 at 23:08 -0500, David Long wrote: > 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 @@ This new file doesn't have any copyright/license notice, I suggest you copy the one from kprobes.h and include a note to say this new files contents were copied, e.g. start it like... /* * arch/arm/include/asm/probes.h * * Original contents copied from arch/arm/include/asm/kprobes.h * which contains the following notice... * * Copyright (C) 2006, 2007 Motorola Inc. * * This program is free software; you can redistribute it and/or modify [...] > +#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