diff options
| author | Tushar Behera <tushar.behera@linaro.org> | 2013-03-25 10:19:06 +0530 |
|---|---|---|
| committer | Tushar Behera <tushar.behera@linaro.org> | 2013-03-25 10:32:41 +0530 |
| commit | ddbc996ce97ca43dd37429b3d6572e7ccb19fed1 (patch) | |
| tree | ce8aa583bc59e24d437b09a370a6a90c67c4659d | |
| parent | 36804a2b2750ac5bba41654110be01a7c13b8022 (diff) | |
fixup: ARM: add mechanism for late code patchingtracking-samslt-all-ll-20130327.1tracking-samslt-all-ll-20130327.0tracking-samslt-all-ll-20130325.0samsung-lt-v3.9-rc3-4
'struct patch_info' is redefined with a completely different
definition. Rename this structure so as to avoid the conflict.
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
| -rw-r--r-- | arch/arm/include/asm/runtime-patch.h | 4 | ||||
| -rw-r--r-- | arch/arm/kernel/runtime-patch.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/include/asm/runtime-patch.h b/arch/arm/include/asm/runtime-patch.h index 366444d7eef9..94a45e55822a 100644 --- a/arch/arm/include/asm/runtime-patch.h +++ b/arch/arm/include/asm/runtime-patch.h @@ -25,7 +25,7 @@ #ifdef CONFIG_ARM_RUNTIME_PATCH -struct patch_info { +struct runtime_patch_info { void *insn; u16 type; u8 insn_size; @@ -34,7 +34,7 @@ struct patch_info { }; #define PATCH_IMM8 0x0001 -struct patch_info_imm8 { +struct runtime_patch_info_imm8 { u32 *imm; u32 insn; }; diff --git a/arch/arm/kernel/runtime-patch.c b/arch/arm/kernel/runtime-patch.c index 0be9ef314a3d..5510a1668570 100644 --- a/arch/arm/kernel/runtime-patch.c +++ b/arch/arm/kernel/runtime-patch.c @@ -143,11 +143,11 @@ static int do_patch_imm8(u32 insn, u32 imm, u32 *ninsn) #endif /* CONFIG_THUMB2_KERNEL */ -static int apply_patch_imm8(const struct patch_info *p) +static int apply_patch_imm8(const struct runtime_patch_info *p) { u32 *insn_ptr = p->insn, ninsn; int count = p->insn_size / sizeof(u32); - const struct patch_info_imm8 *info; + const struct runtime_patch_info_imm8 *info; int err; @@ -242,7 +242,7 @@ static void __init runtime_patch_test(void) int runtime_patch(const void *table, unsigned size) { - const struct patch_info *p = table, *end = (table + size); + const struct runtime_patch_info *p = table, *end = (table + size); for (p = table; p < end; p = patch_next(p)) { int err = -EINVAL; |