diff options
Diffstat (limited to 'arch/arm/kernel/probes-arm.c')
-rw-r--r-- | arch/arm/kernel/probes-arm.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/kernel/probes-arm.c b/arch/arm/kernel/probes-arm.c index 36002e5d0f0e..3357a074597d 100644 --- a/arch/arm/kernel/probes-arm.c +++ b/arch/arm/kernel/probes-arm.c | |||
@@ -57,7 +57,7 @@ | |||
57 | * read and write of flags. | 57 | * read and write of flags. |
58 | */ | 58 | */ |
59 | 59 | ||
60 | void __kprobes simulate_bbl(kprobe_opcode_t insn, | 60 | void __kprobes simulate_bbl(probes_opcode_t insn, |
61 | struct arch_specific_insn *asi, struct pt_regs *regs) | 61 | struct arch_specific_insn *asi, struct pt_regs *regs) |
62 | { | 62 | { |
63 | long iaddr = (long) regs->ARM_pc - 4; | 63 | long iaddr = (long) regs->ARM_pc - 4; |
@@ -69,7 +69,7 @@ void __kprobes simulate_bbl(kprobe_opcode_t insn, | |||
69 | regs->ARM_pc = iaddr + 8 + disp; | 69 | regs->ARM_pc = iaddr + 8 + disp; |
70 | } | 70 | } |
71 | 71 | ||
72 | void __kprobes simulate_blx1(kprobe_opcode_t insn, | 72 | void __kprobes simulate_blx1(probes_opcode_t insn, |
73 | struct arch_specific_insn *asi, struct pt_regs *regs) | 73 | struct arch_specific_insn *asi, struct pt_regs *regs) |
74 | { | 74 | { |
75 | long iaddr = (long) regs->ARM_pc - 4; | 75 | long iaddr = (long) regs->ARM_pc - 4; |
@@ -80,7 +80,7 @@ void __kprobes simulate_blx1(kprobe_opcode_t insn, | |||
80 | regs->ARM_cpsr |= PSR_T_BIT; | 80 | regs->ARM_cpsr |= PSR_T_BIT; |
81 | } | 81 | } |
82 | 82 | ||
83 | void __kprobes simulate_blx2bx(kprobe_opcode_t insn, | 83 | void __kprobes simulate_blx2bx(probes_opcode_t insn, |
84 | struct arch_specific_insn *asi, struct pt_regs *regs) | 84 | struct arch_specific_insn *asi, struct pt_regs *regs) |
85 | { | 85 | { |
86 | int rm = insn & 0xf; | 86 | int rm = insn & 0xf; |
@@ -95,7 +95,7 @@ void __kprobes simulate_blx2bx(kprobe_opcode_t insn, | |||
95 | regs->ARM_cpsr |= PSR_T_BIT; | 95 | regs->ARM_cpsr |= PSR_T_BIT; |
96 | } | 96 | } |
97 | 97 | ||
98 | void __kprobes simulate_mrs(kprobe_opcode_t insn, | 98 | void __kprobes simulate_mrs(probes_opcode_t insn, |
99 | struct arch_specific_insn *asi, struct pt_regs *regs) | 99 | struct arch_specific_insn *asi, struct pt_regs *regs) |
100 | { | 100 | { |
101 | int rd = (insn >> 12) & 0xf; | 101 | int rd = (insn >> 12) & 0xf; |
@@ -103,7 +103,7 @@ void __kprobes simulate_mrs(kprobe_opcode_t insn, | |||
103 | regs->uregs[rd] = regs->ARM_cpsr & mask; | 103 | regs->uregs[rd] = regs->ARM_cpsr & mask; |
104 | } | 104 | } |
105 | 105 | ||
106 | void __kprobes simulate_mov_ipsp(kprobe_opcode_t insn, | 106 | void __kprobes simulate_mov_ipsp(probes_opcode_t insn, |
107 | struct arch_specific_insn *asi, struct pt_regs *regs) | 107 | struct arch_specific_insn *asi, struct pt_regs *regs) |
108 | { | 108 | { |
109 | regs->uregs[12] = regs->uregs[13]; | 109 | regs->uregs[12] = regs->uregs[13]; |
@@ -704,7 +704,7 @@ const union decode_item kprobe_decode_arm_table[] = { | |||
704 | EXPORT_SYMBOL_GPL(kprobe_decode_arm_table); | 704 | EXPORT_SYMBOL_GPL(kprobe_decode_arm_table); |
705 | #endif | 705 | #endif |
706 | 706 | ||
707 | static void __kprobes arm_singlestep(kprobe_opcode_t insn, | 707 | static void __kprobes arm_singlestep(probes_opcode_t insn, |
708 | struct arch_specific_insn *asi, struct pt_regs *regs) | 708 | struct arch_specific_insn *asi, struct pt_regs *regs) |
709 | { | 709 | { |
710 | regs->ARM_pc += 4; | 710 | regs->ARM_pc += 4; |
@@ -724,11 +724,11 @@ static void __kprobes arm_singlestep(kprobe_opcode_t insn, | |||
724 | * should also be very rare. | 724 | * should also be very rare. |
725 | */ | 725 | */ |
726 | enum kprobe_insn __kprobes | 726 | enum kprobe_insn __kprobes |
727 | arm_kprobe_decode_insn(kprobe_opcode_t insn, struct arch_specific_insn *asi, | 727 | arm_kprobe_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi, |
728 | const union decode_action *actions) | 728 | const union decode_action *actions) |
729 | { | 729 | { |
730 | asi->insn_singlestep = arm_singlestep; | 730 | asi->insn_singlestep = arm_singlestep; |
731 | asi->insn_check_cc = kprobe_condition_checks[insn>>28]; | 731 | asi->insn_check_cc = probes_condition_checks[insn>>28]; |
732 | return kprobe_decode_insn(insn, asi, kprobe_decode_arm_table, false, | 732 | return kprobe_decode_insn(insn, asi, kprobe_decode_arm_table, false, |
733 | actions); | 733 | actions); |
734 | } | 734 | } |