Index: sys/arch/hppa/hppa/trap.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hppa/hppa/trap.c,v
retrieving revision 1.101
diff -u -p -u -r1.101 trap.c
--- sys/arch/hppa/hppa/trap.c	23 Apr 2012 11:25:03 -0000	1.101
+++ sys/arch/hppa/hppa/trap.c	4 Jul 2013 07:11:36 -0000
@@ -1237,17 +1238,8 @@ syscall(struct trapframe *frame, int *ar
 	}
 #endif
 
-	error = 0;
-	if (__predict_false(p->p_trace_enabled)) {
-		error = trace_enter(code, args, callp->sy_narg);
-		if (error)
-			goto out;
-	}
+	error = sy_invoke(callp, l, args, rval, code);
 
-	rval[0] = 0;
-	rval[1] = 0;
-	error = sy_call(callp, l, args, rval);
-out:
 	switch (error) {
 	case 0:
 		l = curlwp;			/* changes on exec() */
@@ -1286,9 +1278,6 @@ out:
 		break;
 	}
 
-	if (__predict_false(p->p_trace_enabled))
-		trace_exit(code, rval, error);
-
 	userret(l, frame->tf_iioq_head, 0);
 
 #ifdef DIAGNOSTIC