Merge branch 'kprobes' of git://git.linaro.org/people/nico/linux into…

… fixes
torvalds · Apr 29, 2011 · 408133e · 408133e
2 parents ef26750 + cdc2536
commit 408133e
Show file tree

Hide file tree

Showing 3 changed files with 462 additions and 321 deletions.
diff --git 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 {