diff options
Diffstat (limited to 'arch/arm/kernel/probes.c')
-rw-r--r-- | arch/arm/kernel/probes.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/kernel/probes.c b/arch/arm/kernel/probes.c index f2ab8856ba2b..c1cdc0d27e05 100644 --- a/arch/arm/kernel/probes.c +++ b/arch/arm/kernel/probes.c | |||
@@ -167,7 +167,7 @@ static unsigned long __kprobes __check_al(unsigned long cpsr) | |||
167 | return true; | 167 | return true; |
168 | } | 168 | } |
169 | 169 | ||
170 | kprobe_check_cc * const kprobe_condition_checks[16] = { | 170 | probes_check_cc * const probes_condition_checks[16] = { |
171 | &__check_eq, &__check_ne, &__check_cs, &__check_cc, | 171 | &__check_eq, &__check_ne, &__check_cs, &__check_cc, |
172 | &__check_mi, &__check_pl, &__check_vs, &__check_vc, | 172 | &__check_mi, &__check_pl, &__check_vs, &__check_vc, |
173 | &__check_hi, &__check_ls, &__check_ge, &__check_lt, | 173 | &__check_hi, &__check_ls, &__check_ge, &__check_lt, |
@@ -175,13 +175,13 @@ kprobe_check_cc * const kprobe_condition_checks[16] = { | |||
175 | }; | 175 | }; |
176 | 176 | ||
177 | 177 | ||
178 | void __kprobes kprobe_simulate_nop(kprobe_opcode_t opcode, | 178 | void __kprobes kprobe_simulate_nop(probes_opcode_t opcode, |
179 | struct arch_specific_insn *asi, | 179 | struct arch_specific_insn *asi, |
180 | struct pt_regs *regs) | 180 | struct pt_regs *regs) |
181 | { | 181 | { |
182 | } | 182 | } |
183 | 183 | ||
184 | void __kprobes kprobe_emulate_none(kprobe_opcode_t opcode, | 184 | void __kprobes kprobe_emulate_none(probes_opcode_t opcode, |
185 | struct arch_specific_insn *asi, | 185 | struct arch_specific_insn *asi, |
186 | struct pt_regs *regs) | 186 | struct pt_regs *regs) |
187 | { | 187 | { |
@@ -195,8 +195,8 @@ void __kprobes kprobe_emulate_none(kprobe_opcode_t opcode, | |||
195 | * unconditional as the condition code will already be checked before any | 195 | * unconditional as the condition code will already be checked before any |
196 | * emulation handler is called. | 196 | * emulation handler is called. |
197 | */ | 197 | */ |
198 | static kprobe_opcode_t __kprobes | 198 | static probes_opcode_t __kprobes |
199 | prepare_emulated_insn(kprobe_opcode_t insn, struct arch_specific_insn *asi, | 199 | prepare_emulated_insn(probes_opcode_t insn, struct arch_specific_insn *asi, |
200 | bool thumb) | 200 | bool thumb) |
201 | { | 201 | { |
202 | #ifdef CONFIG_THUMB2_KERNEL | 202 | #ifdef CONFIG_THUMB2_KERNEL |
@@ -221,7 +221,7 @@ prepare_emulated_insn(kprobe_opcode_t insn, struct arch_specific_insn *asi, | |||
221 | * prepare_emulated_insn | 221 | * prepare_emulated_insn |
222 | */ | 222 | */ |
223 | static void __kprobes | 223 | static void __kprobes |
224 | set_emulated_insn(kprobe_opcode_t insn, struct arch_specific_insn *asi, | 224 | set_emulated_insn(probes_opcode_t insn, struct arch_specific_insn *asi, |
225 | bool thumb) | 225 | bool thumb) |
226 | { | 226 | { |
227 | #ifdef CONFIG_THUMB2_KERNEL | 227 | #ifdef CONFIG_THUMB2_KERNEL |
@@ -257,14 +257,14 @@ set_emulated_insn(kprobe_opcode_t insn, struct arch_specific_insn *asi, | |||
257 | * non-zero value, the corresponding nibble in pinsn is validated and modified | 257 | * non-zero value, the corresponding nibble in pinsn is validated and modified |
258 | * according to the type. | 258 | * according to the type. |
259 | */ | 259 | */ |
260 | static bool __kprobes decode_regs(kprobe_opcode_t *pinsn, u32 regs) | 260 | static bool __kprobes decode_regs(probes_opcode_t *pinsn, u32 regs) |
261 | { | 261 | { |
262 | kprobe_opcode_t insn = *pinsn; | 262 | probes_opcode_t insn = *pinsn; |
263 | kprobe_opcode_t mask = 0xf; /* Start at least significant nibble */ | 263 | probes_opcode_t mask = 0xf; /* Start at least significant nibble */ |
264 | 264 | ||
265 | for (; regs != 0; regs >>= 4, mask <<= 4) { | 265 | for (; regs != 0; regs >>= 4, mask <<= 4) { |
266 | 266 | ||
267 | kprobe_opcode_t new_bits = INSN_NEW_BITS; | 267 | probes_opcode_t new_bits = INSN_NEW_BITS; |
268 | 268 | ||
269 | switch (regs & 0xf) { | 269 | switch (regs & 0xf) { |
270 | 270 | ||
@@ -383,7 +383,7 @@ static const int decode_struct_sizes[NUM_DECODE_TYPES] = { | |||
383 | * | 383 | * |
384 | */ | 384 | */ |
385 | int __kprobes | 385 | int __kprobes |
386 | kprobe_decode_insn(kprobe_opcode_t insn, struct arch_specific_insn *asi, | 386 | kprobe_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi, |
387 | const union decode_item *table, bool thumb, | 387 | const union decode_item *table, bool thumb, |
388 | const union decode_action *actions) | 388 | const union decode_action *actions) |
389 | { | 389 | { |