diff options
author | David A. Long <dave.long@linaro.org> | 2014-03-05 21:41:29 -0500 |
---|---|---|
committer | David A. Long <dave.long@linaro.org> | 2014-03-18 16:39:40 -0400 |
commit | b4cd605ca92d9a8a2f71355cb45dd943ebcb0c97 (patch) | |
tree | 01f6832e2d9f98344b5913efdb257447f4241742 /arch/arm/kernel/probes.h | |
parent | 602cd2609eee92d338a83e400774e97c60535ba2 (diff) |
ARM: Make arch_specific_insn a define for new arch_probes_insn structure
Because the common underlying code for ARM kprobes and uprobes needs
to share a common architecrure-specific context structure, and because
the generic kprobes include file insists on defining this to a dummy
structure when kprobes is not configured, a new common structure is
required which can exist when uprobes is configured without kprobes.
In this case kprobes will define a dummy structure, but without the
define aliasing the two structure tags it will not affect uprobes and
the shared probes code.
Signed-off-by: David A. Long <dave.long@linaro.org>
Acked-by: Jon Medhurst <tixy@linaro.org>
Diffstat (limited to 'arch/arm/kernel/probes.h')
-rw-r--r-- | arch/arm/kernel/probes.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/probes.h b/arch/arm/kernel/probes.h index 33cc30c50cf5..dba9f2466a93 100644 --- a/arch/arm/kernel/probes.h +++ b/arch/arm/kernel/probes.h | |||
@@ -306,7 +306,7 @@ union decode_item { | |||
306 | 306 | ||
307 | struct decode_header; | 307 | struct decode_header; |
308 | typedef enum probes_insn (probes_custom_decode_t)(probes_opcode_t, | 308 | typedef enum probes_insn (probes_custom_decode_t)(probes_opcode_t, |
309 | struct arch_specific_insn *, | 309 | struct arch_probes_insn *, |
310 | const struct decode_header *); | 310 | const struct decode_header *); |
311 | 311 | ||
312 | union decode_action { | 312 | union decode_action { |
@@ -400,7 +400,7 @@ probes_insn_handler_t probes_simulate_nop; | |||
400 | probes_insn_handler_t probes_emulate_none; | 400 | probes_insn_handler_t probes_emulate_none; |
401 | 401 | ||
402 | int __kprobes | 402 | int __kprobes |
403 | probes_decode_insn(probes_opcode_t insn, struct arch_specific_insn *asi, | 403 | probes_decode_insn(probes_opcode_t insn, struct arch_probes_insn *asi, |
404 | const union decode_item *table, bool thumb, bool emulate, | 404 | const union decode_item *table, bool thumb, bool emulate, |
405 | const union decode_action *actions); | 405 | const union decode_action *actions); |
406 | 406 | ||