From: David Long <dave.long@linaro.org>
To: linux-arm-kernel@lists.infradead.org
Cc: Rabin Vincent <rabin@rab.in>,
"Jon Medhurst (Tixy)" <tixy@linaro.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 6/9] ARM: move shared uprobe/kprobe definitions into new include file
Date: Thu, 1 Aug 2013 19:45:50 -0400 [thread overview]
Message-ID: <1375400753-3454-7-git-send-email-dave.long@linaro.org> (raw)
In-Reply-To: <1375400753-3454-1-git-send-email-dave.long@linaro.org>
From: "David A. Long" <dave.long@linaro.org>
Separate the kprobe-only definitions from the definitions needed by
both kprobes and uprobes.
Signed-off-by: David A. Long <dave.long@linaro.org>
---
arch/arm/include/asm/kprobes.h | 17 +----------------
arch/arm/include/asm/probes.h | 23 +++++++++++++++++++++++
2 files changed, 24 insertions(+), 16 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..53b1a80 100644
--- a/arch/arm/include/asm/kprobes.h
+++ b/arch/arm/include/asm/kprobes.h
@@ -27,22 +27,7 @@
#define flush_insn_slot(p) do { } while (0)
#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 <asm/probes.h>
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..df46994
--- /dev/null
+++ b/arch/arm/include/asm/probes.h
@@ -0,0 +1,23 @@
+#ifndef _ASM_PROBES_H
+#define _ASM_PROBES_H
+
+#ifdef CONFIG_KPROBES
+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;
+};
+#endif
+
+#endif
--
1.8.1.2
next prev parent reply other threads:[~2013-08-01 23:46 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-01 23:45 [PATCH 0/9] uprobes: Add uprobes support for ARM David Long
2013-08-01 23:45 ` [PATCH 1/9] uprobes: move function declarations out of arch David Long
2013-08-01 23:45 ` [PATCH 2/9] uprobes: allow ignoring of probe hits David Long
2013-08-01 23:45 ` [PATCH 3/9] uprobes: allow arch access to xol slot David Long
2013-08-01 23:45 ` [PATCH 4/9] uprobes: allow arch-specific initialization David Long
2013-08-01 23:45 ` [PATCH 5/9] uprobes: add arch write opcode hook David Long
2013-08-01 23:45 ` David Long [this message]
2013-08-01 23:45 ` [PATCH 7/9] ARM: Move uprobes/kprobes shared functions to common file David Long
2013-08-29 14:08 ` Jon Medhurst (Tixy)
2013-08-01 23:45 ` [PATCH 8/9] ARM: Add "action" table for kprobes/uprobes instruction David Long
2013-08-29 14:09 ` Jon Medhurst (Tixy)
2013-08-01 23:45 ` [PATCH 9/9] ARM: add uprobes support David Long
2013-08-29 14:54 ` Jon Medhurst (Tixy)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1375400753-3454-7-git-send-email-dave.long@linaro.org \
--to=dave.long@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rabin@rab.in \
--cc=tixy@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).