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 <kris.van.hees@oracle.com>
Acked-by: Allen Pais <allen.pais@oracle.com>

diff --git a/arch/sparc/kernel/module.c b/arch/sparc/kernel/module.c
index 4bbb0eae20702d4eaf0c65e95aee90001ab53bd4..08c9d2742043d0479e8c7ebcafa40dce7cd402f0 100644 (file)
--- a/arch/sparc/kernel/module.c
+++ b/arch/sparc/kernel/module.c
@@ -14,6 +14,7 @@
 #include <linux/ctype.h>
 #include <linux/mm.h>
 
+#include <asm/dtrace_arch.h>
 #include <asm/processor.h>
 #include <asm/spitfire.h>
 #include <asm/cacheflush.h>
@@ -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 */