From owner-p4-projects@FreeBSD.ORG  Sun Apr 27 19:28:06 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CDE4237B404; Sun, 27 Apr 2003 19:28:05 -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 862C037B401
	for <perforce@freebsd.org>; Sun, 27 Apr 2003 19:28:05 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2FC7043F3F
	for <perforce@freebsd.org>; Sun, 27 Apr 2003 19:28:05 -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 h3S2S50U038874
	for <perforce@freebsd.org>; Sun, 27 Apr 2003 19:28:05 -0700 (PDT)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3S2S4kK038870
	for perforce@freebsd.org; Sun, 27 Apr 2003 19:28:04 -0700 (PDT)
Date: Sun, 27 Apr 2003 19:28:04 -0700 (PDT)
Message-Id: <200304280228.h3S2S4kK038870@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 29914 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: Mon, 28 Apr 2003 02:28:07 -0000

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

Change 29914 by jmallett@jmallett_dalek on 2003/04/27 19:27:18

	s/cpu_prid/cpu_id/ for NetBSD compat.

Affected files ...

.. //depot/projects/mips/sys/mips/include/md_var.h#6 edit
.. //depot/projects/mips/sys/mips/mips/locore.S#3 edit
.. //depot/projects/mips/sys/mips/mips/machdep.c#13 edit

Differences ...

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

@@ -31,6 +31,9 @@
 extern	vm_offset_t kstack0;
 extern	vm_paddr_t kstack0_phys;
 
+extern	int cpu_id;
+extern	int fpu_id;
+
 void	cpu_halt(void);
 void	cpu_reset(void);
 void	mips_init(void);

==== //depot/projects/mips/sys/mips/mips/locore.S#3 (text+ko) ====

@@ -90,7 +90,7 @@
 	# coprocessor 1.
 	mfc0	t0, MIPS_COP_0_PRID
 	cfc1	t1, MIPS_FPU_ID
-	sw	t0, cpu_prid
+	sw	t0, cpu_id
 	sw	t1, fpu_id
 
 	# Call the platform-specific startup code.

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

@@ -40,7 +40,7 @@
 #include <machine/md_var.h>
 
 int cold = 1;
-int cpu_prid, fpu_id;
+int cpu_id, fpu_id;
 
 struct pcpu pcpu0;