summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-04-29 12:02:45 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-04-29 12:02:45 +0200
commit408133e9dca2b94c64b917b144ec816df913a94e (patch)
treebe456466d5413bac6de08bd3fea93857c7a1d27b /arch/arm/include/asm
parentMerge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/px... (diff)
parentARM: kprobes: Tidy-up kprobes-decode.c (diff)
downloadlinux-408133e9dca2b94c64b917b144ec816df913a94e.tar.xz
linux-408133e9dca2b94c64b917b144ec816df913a94e.zip
Merge branch 'kprobes' of git://git.linaro.org/people/nico/linux into fixes
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/kprobes.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/include/asm/kprobes.h b/arch/arm/include/asm/kprobes.h
index bb8a19bd5822..e46bdd0097eb 100644
--- a/arch/arm/include/asm/kprobes.h
+++ b/arch/arm/include/asm/kprobes.h
@@ -39,10 +39,13 @@ 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);
+
/* 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;
};
struct prev_kprobe {