dtrace: apply sdt_instr_t change to asm_instr_t

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
Acked-by: Nick Alcock <nick.alcock@oracle.com>

diff --git a/dtrace/include/sparc64/dtrace/mod_arch.h b/dtrace/include/sparc64/dtrace/mod_arch.h
index 7254ae84c420a9e37012b9c178633d3ae9e3c822..b665012c48baea1d8406f3347569b39394596920 100644 (file)
--- a/dtrace/include/sparc64/dtrace/mod_arch.h
+++ b/dtrace/include/sparc64/dtrace/mod_arch.h
@@ -25,7 +25,7 @@
  * Use is subject to license terms.
  */
 
-#include <asm/dtrace_sdt.h>
+#include <asm/dtrace_arch.h>
 
 /*
  * Structure to hold DTrace specific information about modules (including the
@@ -38,7 +38,7 @@
 typedef struct dtrace_module {
         size_t          sdt_probe_cnt;
         int             sdt_enabled;
-       sdt_instr_t     *sdt_tab;
+       asm_instr_t     *sdt_tab;
         size_t          fbt_probe_cnt;
 } dtrace_module_t;
 

diff --git a/dtrace/sdt_dev.c b/dtrace/sdt_dev.c
index 4f5acc7f1df3559bfa562ef44a048991369c3eba..b02154d8ad6ca68e04d0243e1fae1a1cab445805 100644 (file)
--- a/dtrace/sdt_dev.c
+++ b/dtrace/sdt_dev.c
@@ -203,7 +203,7 @@ void sdt_provide_module(void *arg, struct module *mp)
                                        SDT_ADDR2NDX(sdpd->sdpd_offset)];
                sdt_probetab[SDT_ADDR2NDX(sdpd->sdpd_offset)] = sdp;
 
-               sdp->sdp_patchpoint = (sdt_instr_t *)sdpd->sdpd_offset;
+               sdp->sdp_patchpoint = (asm_instr_t *)sdpd->sdpd_offset;
 
                sdt_provide_probe_arch(sdp, mp, idx);
        }

diff --git a/dtrace/sdt_impl.h b/dtrace/sdt_impl.h
index f60ca2512045658f9f6223f7bf285ac1f9378762..3c036418283767dc0a1f55dad5e9ffb256c2220f 100644 (file)
--- a/dtrace/sdt_impl.h
+++ b/dtrace/sdt_impl.h
@@ -2,7 +2,7 @@
 #define _SDT_IMPL_H_
 
 #include <linux/sdt.h>
-#include <asm/dtrace_sdt.h>
+#include <asm/dtrace_arch.h>
 #include <dtrace/sdt_arch.h>
 
 extern struct module           *dtrace_kmod;
@@ -15,9 +15,9 @@ typedef struct sdt_probe {
        struct module           *sdp_module;    /* modctl for module */
        int                     sdp_loadcnt;    /* load count for module */
        int                     sdp_primary;    /* non-zero if primary mod */
-       sdt_instr_t             *sdp_patchpoint;/* patch point */
-       sdt_instr_t             sdp_patchval;   /* instruction to patch */
-       sdt_instr_t             sdp_savedval;   /* saved instruction value */
+       asm_instr_t             *sdp_patchpoint;/* patch point */
+       asm_instr_t             sdp_patchval;   /* instruction to patch */
+       asm_instr_t             sdp_savedval;   /* saved instruction value */
        struct sdt_probe        *sdp_next;      /* next probe */
        struct sdt_probe        *sdp_hashnext;  /* next on hash */
 } sdt_probe_t;

diff --git a/dtrace/sdt_sparc64.c b/dtrace/sdt_sparc64.c
index 89319821f88553897e118c52ffcb4bc826f9450b..44d50f38b397fed099574e3ab20ce29a7501dd77 100644 (file)
--- a/dtrace/sdt_sparc64.c
+++ b/dtrace/sdt_sparc64.c
@@ -118,9 +118,9 @@
 
 void sdt_provide_probe_arch(sdt_probe_t *sdp, struct module *mp, int idx)
 {
-       sdt_instr_t     *trampoline = &(PDATA(mp)->sdt_tab[idx *
+       asm_instr_t     *trampoline = &(PDATA(mp)->sdt_tab[idx *
                                                           SDT_TRAMP_SIZE]);
-       sdt_instr_t     *instr = trampoline;
+       asm_instr_t     *instr = trampoline;
 
        *instr++ = SDT_SAVE;
 
@@ -152,7 +152,7 @@ int sdt_provide_module_arch(void *arg, struct module *mp)
         * The vmlinux pseudo-module (core Linux kernel) is a special case...
         */
        if (mp == dtrace_kmod && PDATA(mp)->sdt_tab == NULL) {
-               PDATA(mp)->sdt_tab = (sdt_instr_t *)ALIGN(
+               PDATA(mp)->sdt_tab = (asm_instr_t *)ALIGN(
                        (uintptr_t)PDATA(mp) + sizeof(dtrace_module_t), 8);
                return 1;
        }