summaryrefslogtreecommitdiffstats
path: root/runtime/uprobes
diff options
context:
space:
mode:
Diffstat (limited to 'runtime/uprobes')
-rw-r--r--runtime/uprobes/uprobes_arch.c4
-rw-r--r--runtime/uprobes/uprobes_arch.h4
-rw-r--r--runtime/uprobes/uprobes_ppc.c (renamed from runtime/uprobes/uprobes_ppc64.c)4
-rw-r--r--runtime/uprobes/uprobes_ppc.h (renamed from runtime/uprobes/uprobes_ppc64.h)0
4 files changed, 6 insertions, 6 deletions
diff --git a/runtime/uprobes/uprobes_arch.c b/runtime/uprobes/uprobes_arch.c
index 99ef54c8..6c58d5fb 100644
--- a/runtime/uprobes/uprobes_arch.c
+++ b/runtime/uprobes/uprobes_arch.c
@@ -2,8 +2,8 @@
#include "uprobes_x86_64.c"
#elif defined (__i386__)
#include "uprobes_i386.c"
-#elif defined (__powerpc64__)
-#include "uprobes_ppc64.c"
+#elif defined (__powerpc__)
+#include "uprobes_ppc.c"
#elif defined (__s390__) || defined (__s390x__)
#include "uprobes_s390.c"
#else
diff --git a/runtime/uprobes/uprobes_arch.h b/runtime/uprobes/uprobes_arch.h
index 0223e280..f642f528 100644
--- a/runtime/uprobes/uprobes_arch.h
+++ b/runtime/uprobes/uprobes_arch.h
@@ -2,8 +2,8 @@
#include "uprobes_x86_64.h"
#elif defined (__i386__)
#include "uprobes_i386.h"
-#elif defined (__powerpc64__)
-#include "uprobes_ppc64.h"
+#elif defined (__powerpc__)
+#include "uprobes_ppc.h"
#elif defined (__s390__) || defined (__s390x__)
#include "uprobes_s390.h"
#else
diff --git a/runtime/uprobes/uprobes_ppc64.c b/runtime/uprobes/uprobes_ppc.c
index 819ac73d..b625b879 100644
--- a/runtime/uprobes/uprobes_ppc64.c
+++ b/runtime/uprobes/uprobes_ppc.c
@@ -89,9 +89,9 @@ static inline void calc_offset(struct uprobe_probept *ppt,
}
#ifdef UPROBES_DEBUG
printk (KERN_ERR "ppt->vaddr=%p, regs->nip=%p, offset=%ld\n",
- ppt->vaddr, regs->nip, offset);
+ (void*)(long)ppt->vaddr, (void*)(long)regs->nip, (long)offset);
if (insn & 1)
- printk (KERN_ERR "regs->link=%p \n", regs->link);
+ printk (KERN_ERR "regs->link=%p \n", (void*)(long)regs->link);
#endif
return;
}
diff --git a/runtime/uprobes/uprobes_ppc64.h b/runtime/uprobes/uprobes_ppc.h
index 56046351..56046351 100644
--- a/runtime/uprobes/uprobes_ppc64.h
+++ b/runtime/uprobes/uprobes_ppc.h