From owner-p4-projects@FreeBSD.ORG  Wed Dec 12 21:16:54 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 48353D02; Wed, 12 Dec 2012 21:16:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 088F3D00
 for <perforce@freebsd.org>; Wed, 12 Dec 2012 21:16:54 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id E0D468FC15
 for <perforce@freebsd.org>; Wed, 12 Dec 2012 21:16:53 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qBCLGrxG005451
 for <perforce@freebsd.org>; Wed, 12 Dec 2012 21:16:53 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qBCLGrPp005448
 for perforce@freebsd.org; Wed, 12 Dec 2012 21:16:53 GMT
 (envelope-from brooks@freebsd.org)
Date: Wed, 12 Dec 2012 21:16:53 GMT
Message-Id: <201212122116.qBCLGrPp005448@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 219899 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 21:16:54 -0000

http://p4web.freebsd.org/@@219899?ac=10

Change 219899 by brooks@brooks_zenith on 2012/12/12 21:16:50

	We can't currently copyout to sandboxes due to the use of the
	wrong CP0 by the kernel so alter the code to return the counter
	directly.  The caller needs to know that the return is actually
	unsigned.  Fortunatly, this can't fail so not having an error
	indicator is fine.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/sys_machdep.c#4 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/sys/mips/mips/sys_machdep.c#4 (text+ko) ====

@@ -56,7 +56,6 @@
 sysarch(struct thread *td, struct sysarch_args *uap)
 {
 	int error;
-	uint32_t count;
 	void *tlsbase;
 
 	switch (uap->op) {
@@ -68,9 +67,8 @@
 		error = copyout(&tlsbase, uap->parms, sizeof(tlsbase));
 		return (error);
 	case MIPS_GET_COUNT:
-		count = mips_rd_count();
-		error = copyout(&count, uap->parms, sizeof(count));
-		return (error);
+		td->td_retval[0] = mips_rd_count();
+		return (0);
 	default:
 		break;
 	}