From owner-p4-projects@FreeBSD.ORG  Wed Oct  4 09:44:49 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 E5C3916A47B; Wed,  4 Oct 2006 09:44:48 +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 C239616A412
	for <perforce@FreeBSD.org>; Wed,  4 Oct 2006 09:44:48 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8509143D55
	for <perforce@FreeBSD.org>; Wed,  4 Oct 2006 09:44:48 +0000 (GMT)
	(envelope-from gonzo@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 k949imfS025642
	for <perforce@FreeBSD.org>; Wed, 4 Oct 2006 09:44:48 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k949im26025639
	for perforce@freebsd.org; Wed, 4 Oct 2006 09:44:48 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Wed, 4 Oct 2006 09:44:48 GMT
Message-Id: <200610040944.k949im26025639@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 107244 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: Wed, 04 Oct 2006 09:44:49 -0000

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

Change 107244 by gonzo@gonzo_hq on 2006/10/04 09:44:18

	o Rename KSEG2 to KSSEG.
	o Add KSEG3 bounds to defines.
	o Move KVA from wrongly chosen KSSEG to KSEG3.

Affected files ...

.. //depot/projects/mips2/src/sys/mips/include/cpuregs.h#9 edit
.. //depot/projects/mips2/src/sys/mips/include/vmparam.h#7 edit
.. //depot/projects/mips2/src/sys/mips/mips/tlb.c#10 edit

Differences ...

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

@@ -81,8 +81,10 @@
 #define	MIPS_KSEG0_END			0x9fffffff
 #define	MIPS_KSEG1_START		0xa0000000
 #define	MIPS_KSEG1_END			0xbfffffff
-#define	MIPS_KSEG2_START		0xc0000000
-#define	MIPS_KSEG2_END			0xffffffff
+#define	MIPS_KSSEG_START		0xc0000000
+#define	MIPS_KSSEG_END			0xdfffffff
+#define	MIPS_KSEG3_START		0xe0000000
+#define	MIPS_KSEG3_END			0xffffffff
 #define	MIPS_MAX_MEM_ADDR		0xbe000000
 #define	MIPS_RESERVED_ADDR		0xbfc80000
 

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

@@ -106,8 +106,8 @@
 #define VM_MIN_ADDRESS		((vm_offset_t)0x0000000000010000)
 #define VM_MAXUSER_ADDRESS	((vm_offset_t)MIPS_KSEG0_START-1)
 #define VM_MAX_ADDRESS		((vm_offset_t)0x0000000100000000)
-#define VM_MIN_KERNEL_ADDRESS	((vm_offset_t)MIPS_KSEG2_START)
-#define VM_MAX_KERNEL_ADDRESS	((vm_offset_t)MIPS_KSEG2_END)
+#define VM_MIN_KERNEL_ADDRESS	((vm_offset_t)MIPS_KSEG3_START)
+#define VM_MAX_KERNEL_ADDRESS	((vm_offset_t)MIPS_KSEG3_END)
 #define	KERNBASE		(VM_MIN_KERNEL_ADDRESS)
 
 /* virtual sizes (bytes) for various kernel submaps */

==== //depot/projects/mips2/src/sys/mips/mips/tlb.c#10 (text+ko) ====

@@ -218,7 +218,7 @@
 	u_long ehi;
 
 	/* Bogus VPN2. */
-	ehi = MIPS_KSEG2_START + 0x0fff0000 + 2 * i * PAGE_SIZE;
+	ehi = MIPS_KSEG3_START + 0x0fff0000 + 2 * i * PAGE_SIZE;
 	mips_wr_index(i);
 	mips_wr_entrylo0(0);
 	mips_wr_entrylo1(0);