Merge tag 'v4.4.41' into linux-linaro-lsk-v4.4

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / include / asm / probes.h

diff --git a/arch/arm64/include/asm/probes.h b/arch/arm64/include/asm/probes.h
index 1e8a21a9600205dc2da30d4e54671dad6d349fe6..5af574d632fa496a89d63d6c0d44bedfce586e71 100644 (file)
--- a/arch/arm64/include/asm/probes.h
+++ b/arch/arm64/include/asm/probes.h
@@ -15,17 +15,18 @@
 #ifndef _ARM_PROBES_H
 #define _ARM_PROBES_H
 
+#include <asm/opcodes.h>
+
 struct kprobe;
 struct arch_specific_insn;
 
 typedef u32 kprobe_opcode_t;
-typedef unsigned long (kprobes_pstate_check_t)(unsigned long);
 typedef void (kprobes_handler_t) (u32 opcode, long addr, struct pt_regs *);
 
 /* architecture specific copy of original instruction */
 struct arch_specific_insn {
        kprobe_opcode_t *insn;
-       kprobes_pstate_check_t *pstate_cc;
+       pstate_check_t *pstate_cc;
        kprobes_handler_t *handler;
        /* restore address after step xol */
        unsigned long restore;