From b19d1a6bfd5d631899a0511c64ff05bf55edbc8d Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 31 Dec 2011 12:17:55 +0100 Subject: [PATCH] VKERNEL64: Adjust for the ktr changes (to fix build). --- sys/platform/vkernel64/x86_64/trap.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/sys/platform/vkernel64/x86_64/trap.c b/sys/platform/vkernel64/x86_64/trap.c index 502c8bdafe..bebbc56468 100644 --- a/sys/platform/vkernel64/x86_64/trap.c +++ b/sys/platform/vkernel64/x86_64/trap.c @@ -343,16 +343,17 @@ userexit(struct lwp *lp) #define KTR_KERNENTRY KTR_ALL #endif KTR_INFO_MASTER(kernentry); -KTR_INFO(KTR_KERNENTRY, kernentry, trap, 0, "pid=%d, tid=%d, trapno=%d, eva=%p", - sizeof(int) + sizeof(int) + sizeof(int) + sizeof(vm_offset_t)); -KTR_INFO(KTR_KERNENTRY, kernentry, trap_ret, 0, "pid=%d, tid=%d", - sizeof(int) + sizeof(int)); -KTR_INFO(KTR_KERNENTRY, kernentry, syscall, 0, "pid=%d, tid=%d, call=%d", - sizeof(int) + sizeof(int) + sizeof(int)); -KTR_INFO(KTR_KERNENTRY, kernentry, syscall_ret, 0, "pid=%d, tid=%d, err=%d", - sizeof(int) + sizeof(int) + sizeof(int)); -KTR_INFO(KTR_KERNENTRY, kernentry, fork_ret, 0, "pid=%d, tid=%d", - sizeof(int) + sizeof(int)); +KTR_INFO(KTR_KERNENTRY, kernentry, trap, 0, + "TRAP(pid %hd, tid %hd, trapno %ld, eva %lu)", + pid_t pid, lwpid_t tid, register_t trapno, vm_offset_t eva); +KTR_INFO(KTR_KERNENTRY, kernentry, trap_ret, 0, "TRAP_RET(pid %hd, tid %hd)", + pid_t pid, lwpid_t tid); +KTR_INFO(KTR_KERNENTRY, kernentry, syscall, 0, "SYSC(pid %hd, tid %hd, nr %ld)", + pid_t pid, lwpid_t tid, register_t trapno); +KTR_INFO(KTR_KERNENTRY, kernentry, syscall_ret, 0, "SYSRET(pid %hd, tid %hd, err %d)", + pid_t pid, lwpid_t tid, int err); +KTR_INFO(KTR_KERNENTRY, kernentry, fork_ret, 0, "FORKRET(pid %hd, tid %hd)", + pid_t pid, lwpid_t tid); /* * Exception, fault, and trap interface to the kernel. @@ -1143,7 +1144,7 @@ syscall2(struct trapframe *frame) mycpu->gd_cnt.v_syscall++; KTR_LOG(kernentry_syscall, lp->lwp_proc->p_pid, lp->lwp_tid, - frame->tf_eax); + frame->tf_rax); userenter(td, p); /* lazy raise our priority */ -- 2.11.4.GIT