From owner-p4-projects@FreeBSD.ORG  Thu Jul  6 11:45:16 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ED6F116A4E1; Thu,  6 Jul 2006 11:45:15 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C963516A4DA
	for <perforce@FreeBSD.org>; Thu,  6 Jul 2006 11:45:15 +0000 (UTC)
	(envelope-from wkoszek@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 93B5643D45
	for <perforce@FreeBSD.org>; Thu,  6 Jul 2006 11:45:15 +0000 (GMT)
	(envelope-from wkoszek@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k66BjFf5067595
	for <perforce@FreeBSD.org>; Thu, 6 Jul 2006 11:45:15 GMT
	(envelope-from wkoszek@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k66BjFiu067592
	for perforce@freebsd.org; Thu, 6 Jul 2006 11:45:15 GMT
	(envelope-from wkoszek@FreeBSD.org)
Date: Thu, 6 Jul 2006 11:45:15 GMT
Message-Id: <200607061145.k66BjFiu067592@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wkoszek@FreeBSD.org using -f
From: "Wojciech A. Koszek" <wkoszek@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 100727 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Thu, 06 Jul 2006 11:45:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=100727

Change 100727 by wkoszek@wkoszek_laptop on 2006/07/06 11:45:11

	Steal some of the ARM bits to make this file compile on MIPS.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/include/cpu.h#2 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/include/cpu.h#2 (text+ko) ====

@@ -37,13 +37,6 @@
 #define	_MACHINE_CPU_H_
 
 /*
- * Definitions unique to i386 cpu support.
- */
-#include <machine/psl.h>
-#include <machine/frame.h>
-#include <machine/segments.h>
-
-/*
  * definitions of cpu-dependent requirements
  * referenced in generic code
  */
@@ -53,7 +46,7 @@
 #define	cpu_swapin(p)	/* nothing */
 #define	cpu_getstack(td)		((td)->td_frame->tf_rsp)
 #define	cpu_setstack(td, ap)		((td)->td_frame->tf_rsp = (ap))
-#define	cpu_spinwait()			ia32_pause()
+#define	cpu_spinwait()			/* ia32_pause() */
 
 #define	TRAPF_USERMODE(framep) \
 	(ISPL((framep)->tf_cs) == SEL_UPL)
@@ -78,14 +71,15 @@
 void	swi_vm(void *);
 
 /*
- * Return contents of in-cpu fast counter as a sort of "bogo-time"
- * for random-harvesting purposes.
+ * XXXMIPS: Taken from src/sys/arm/include/cpu.h.
  */
 static __inline u_int64_t
 get_cyclecount(void)
 {
+	struct bintime bt;
 
-	return (rdtsc());
+	binuptime(&bt);
+	return (bt.frac ^ bt.sec);
 }
 
 #endif