svn commit: r244765 - in head/sys: kern tools

[Oleksandr Tymoshenko]

Author: gonzo
Date: Fri Dec 28 06:52:53 2012
New Revision: 244765
URL: http://svnweb.freebsd.org/changeset/base/244765

Log:
  Fix build on ARM (and probably other platforms)

Modified:
  head/sys/kern/subr_syscall.c
  head/sys/tools/vnode_if.awk

Modified: head/sys/kern/subr_syscall.c
==============================================================================
--- head/sys/kern/subr_syscall.c	Fri Dec 28 05:48:44 2012	(r244764)
+++ head/sys/kern/subr_syscall.c	Fri Dec 28 06:52:53 2012	(r244765)
@@ -78,7 +78,7 @@ syscallenter(struct thread *td, struct s
 		ktrsyscall(sa->code, sa->narg, sa->args);
 #endif
 	KTR_START4(KTR_SYSC, "syscall", syscallname(p, sa->code),
-	    td, "pid:%d", td->td_proc->p_pid, "arg0:%p", sa->args[0],
+	    (uintptr_t)td, "pid:%d", td->td_proc->p_pid, "arg0:%p", sa->args[0],
 	    "arg1:%p", sa->args[1], "arg2:%p", sa->args[2]);
 
 	if (error == 0) {
@@ -152,7 +152,7 @@ syscallenter(struct thread *td, struct s
 	}
  retval:
 	KTR_STOP4(KTR_SYSC, "syscall", syscallname(p, sa->code),
-	    td, "pid:%d", td->td_proc->p_pid, "error:%d", error,
+	    (uintptr_t)td, "pid:%d", td->td_proc->p_pid, "error:%d", error,
 	    "retval0:%#lx", td->td_retval[0], "retval1:%#lx",
 	    td->td_retval[1]);
 	if (traced) {

Modified: head/sys/tools/vnode_if.awk
==============================================================================
--- head/sys/tools/vnode_if.awk	Fri Dec 28 05:48:44 2012	(r244764)
+++ head/sys/tools/vnode_if.awk	Fri Dec 28 06:52:53 2012	(r244765)
@@ -270,7 +270,7 @@ while ((getline < srcfile) > 0) {
 		ctrargs = 4;
 	else
 		ctrargs = numargs;
-	ctrstr = ctrargs "(KTR_VOP, \"VOP\", \"" uname "\", a,\n\t    "; 
+	ctrstr = ctrargs "(KTR_VOP, \"VOP\", \"" uname "\", (uintptr_t)a,\n\t    "; 
 	ctrstr = ctrstr "\"" args[0] ":0x%jX\", (uintptr_t)a->a_" args[0];
 	for (i = 1; i < ctrargs; ++i)
 		ctrstr = ctrstr ", \"" args[i] ":0x%jX\", a->a_" args[i];