Merge commit '973c11b9c3cdde88fe6ca0ef2c5af56a8c49e014' into amd64

diff --cc sys/platform/pc64/amd64/trap.c
index 31b8c02,960fe69..dd036f0
--- 1/sys/platform/pc64/amd64/trap.c
--- 2/sys/platform/pc64/amd64/trap.c
+++ b/sys/platform/pc64/amd64/trap.c
@@@ -876,9 -877,8 +875,9 @@@ nogo
         * NOTE: on amd64 we have a tf_addr field in the trapframe, no
         * kludge is needed to pass the fault address to signal handlers.
         */
 -      kprintf("seg-fault accessing address %p ip=%p\n",
 -              (void *)va, (void *)frame->tf_rip);
 +      struct proc *p = td->td_proc;
 +      kprintf("seg-fault accessing address %p rip=%p pid=%d p_comm=%s\n",
-               va, frame->tf_rip, p->p_pid, p->p_comm);
++              (void *)va, (void *)frame->tf_rip, p->p_pid, p->p_comm);
        /* Debugger("seg-fault"); */
  
        return((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV);

diff --cc sys/platform/pc64/amd64/vm_machdep.c
index 8e2eaec,32f99f0..c6b5876
--- 1/sys/platform/pc64/amd64/vm_machdep.c
--- 2/sys/platform/pc64/amd64/vm_machdep.c
+++ b/sys/platform/pc64/amd64/vm_machdep.c
@@@ -203,7 -203,7 +203,7 @@@ cpu_prepare_lwp(struct lwp *lp, struct 
        regs->tf_rip = (long)params->func;
        regs->tf_rsp = (long)params->stack;
        /* Set up argument for function call */
-       regs->tf_rdi = params->arg; /* JG Can this be in userspace addresses? */
 -      regs->tf_rdi = (long)params->arg;
++      regs->tf_rdi = (long)params->arg; /* JG Can this be in userspace addresses? */
        /*
         * Set up fake return address.  As the lwp function may never return,
         * we simply copy out a NULL pointer and force the lwp to receive