From: Kris Van Hees Date: Tue, 2 Jun 2015 20:34:20 +0000 (-0400) Subject: dtrace: convert from sdt_instr_t to asm_instr_t 1of2 X-Git-Tag: v4.1.12-92~313^2~5 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f05aa9fef9fbf985ed7f706caeea2fa36918f44f;p=users%2Fjedix%2Flinux-maple.git dtrace: convert from sdt_instr_t to asm_instr_t 1of2 The sdt_instr_t type was introduced as a generic type name for machine instructions to be defined as a synonym for the arch-specific type. It was named thusly because it was only used by the SDT support code. However, other providers will need it also (e.g. FBT) and therefore it is more appropriate to give it a name that is not tied to a specific provider. Orabug: 21220305 Signed-off-by: Kris Van Hees Acked-by: Allen Pais --- diff --git a/arch/sparc/kernel/module.c b/arch/sparc/kernel/module.c index 4bbb0eae2070..08c9d2742043 100644 --- a/arch/sparc/kernel/module.c +++ b/arch/sparc/kernel/module.c @@ -14,6 +14,7 @@ #include #include +#include #include #include #include @@ -224,7 +225,7 @@ int module_finalize(const Elf_Ehdr *hdr, #ifdef CONFIG_DTRACE me->pdata = module_alloc(me->sdt_probec * SDT_TRAMP_SIZE * - sizeof(sdt_instr_t)); + sizeof(asm_instr_t)); #endif return 0; @@ -233,7 +234,7 @@ int module_finalize(const Elf_Ehdr *hdr, #ifdef CONFIG_DTRACE void module_arch_cleanup(struct module *me) { - module_free(me->pdata); + module_memfree(me->pdata); } #endif #endif /* CONFIG_SPARC64 */