From owner-p4-projects@FreeBSD.ORG  Sat Apr 26 16:39:33 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5089037B404; Sat, 26 Apr 2003 16:39:32 -0700 (PDT)
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 041DE37B401
	for <perforce@freebsd.org>; Sat, 26 Apr 2003 16:39:32 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9F44A43FBF
	for <perforce@freebsd.org>; Sat, 26 Apr 2003 16:39:31 -0700 (PDT)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3QNdV0U019260
	for <perforce@freebsd.org>; Sat, 26 Apr 2003 16:39:31 -0700 (PDT)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3QNdVs8019255
	for perforce@freebsd.org; Sat, 26 Apr 2003 16:39:31 -0700 (PDT)
Date: Sat, 26 Apr 2003 16:39:31 -0700 (PDT)
Message-Id: <200304262339.h3QNdVs8019255@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 29833 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Sat, 26 Apr 2003 23:39:33 -0000

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

Change 29833 by jmallett@jmallett_dalek on 2003/04/26 16:38:38

	Evil hacks so pcpu isn't explodey.

Affected files ...

.. //depot/projects/mips/sys/mips/include/cpufunc.h#6 edit
.. //depot/projects/mips/sys/mips/include/pcpu.h#2 edit
.. //depot/projects/mips/sys/mips/mips/machdep.c#9 edit
.. //depot/projects/mips/sys/mips/mips/pmap.c#6 edit

Differences ...

==== //depot/projects/mips/sys/mips/include/cpufunc.h#6 (text+ko) ====

@@ -50,16 +50,6 @@
 	__asm __volatile ("sync" : : : "memory");
 }
 
-static __inline struct pcpu *
-mips_get_pcpup(void)
-{
-	struct pcpu	*ret;
-
-	/* XXX Get a pointer to the pcpu. */
-
-	return(ret);
-}
-
 #endif /* _KERNEL */
 
 #endif /* !_MACHINE_CPUFUNC_H_ */

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

@@ -37,12 +37,14 @@
 #define	PCPU_MD_FIELDS							\
 	/* XXX Nothing to see here. */
 
-#define PCPUP	((struct pcpu *) mips_get_pcpup())
+#define PCPUP	((struct pcpu *) &pcpu0)
 
 #define	PCPU_GET(member)	(PCPUP->pc_ ## member)
 #define	PCPU_PTR(member)	(&PCPUP->pc_ ## member)
 #define	PCPU_SET(member,value)	(PCPUP->pc_ ## member = (value))
 
+extern struct pcpu pcpu0;
+
 #endif	/* _KERNEL */
 
 #endif	/* !_MACHINE_PCPU_H_ */

==== //depot/projects/mips/sys/mips/mips/machdep.c#9 (text+ko) ====

@@ -42,6 +42,8 @@
 int cold = 1;
 int cpu_prid, fpu_id;
 
+struct pcpu pcpu0;
+
 void
 cpu_halt(void)
 {

==== //depot/projects/mips/sys/mips/mips/pmap.c#6 (text+ko) ====