Module: xenomai-3
Branch: next
Commit: abdf16274680ecd2dcef9845bbd58691e548000d
URL:
http://git.xenomai.org/?p=xenomai-3.git;a=commit;h=abdf16274680ecd2dcef9845bbd58691e548000d
Author: Don Mahurin <d...@mperpetuo.com>
Date: Wed Sep 2 13:48:36 2015 -0700
cobalt/arm64: fix build for mismatched printf type (%lx,u64) on arm64.
pc and orig_r0 are u64 on arm64 and 'unsigned long' or arm and other platforms.
printf referencing these are using %lx. On arm64, long and long long (and u64)
are 64 bits. Rather than changing printf format, chnage arm64 macros to cast to
unsigned long.
---
kernel/cobalt/arch/arm64/include/asm/xenomai/syscall.h | 2 +-
kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h | 2 +-
kernel/cobalt/posix/syscall.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/syscall.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/syscall.h
index 7bf95fb..77c1716 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/syscall.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/syscall.h
@@ -45,7 +45,7 @@
#else /* !CONFIG_OABI_COMPAT */
#define __xn_syscall_p(__regs) ((__regs)->regs[8] == __ARM_NR_ipipe)
#endif /* !CONFIG_OABI_COMPAT */
-#define __xn_syscall(__regs) (__xn_reg_sys(__regs) & ~__COBALT_SYSCALL_BIT)
+#define __xn_syscall(__regs) ((unsigned long)(__xn_reg_sys(__regs) &
~__COBALT_SYSCALL_BIT))
#define __xn_reg_rval(__regs) ((__regs)->regs[0])
#define __xn_reg_arg1(__regs) ((__regs)->regs[1])
diff --git a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
index 958f340..a8d7ed4 100644
--- a/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
+++ b/kernel/cobalt/arch/arm64/include/asm/xenomai/thread.h
@@ -52,7 +52,7 @@ struct xnarchtcb {
#define xnarch_fault_regs(d) ((d)->regs)
#define xnarch_fault_trap(d) ((d)->exception)
#define xnarch_fault_code(d) (0)
-#define xnarch_fault_pc(d) ((d)->regs->pc - 4) /* XXX ? */
+#define xnarch_fault_pc(d) ((unsigned long)((d)->regs->pc - 4)) /* XXX ? */
#define xnarch_fault_pf_p(d) ((d)->exception == IPIPE_TRAP_ACCESS)
#define xnarch_fault_bp_p(d) ((current->ptrace & PT_PTRACED) && \
diff --git a/kernel/cobalt/posix/syscall.c b/kernel/cobalt/posix/syscall.c
index 2926d7e..8186a0f 100644
--- a/kernel/cobalt/posix/syscall.c
+++ b/kernel/cobalt/posix/syscall.c
@@ -666,7 +666,7 @@ linux_syscall:
return KEVENT_PROPAGATE;
bad_syscall:
- printk(XENO_WARNING "bad syscall <%#llx>\n", __xn_syscall(regs));
+ printk(XENO_WARNING "bad syscall <%#lx>\n", __xn_syscall(regs));
__xn_error_return(regs, -ENOSYS);
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
https://xenomai.org/mailman/listinfo/xenomai-git
