Module Name: src
Committed By: tsutsui
Date: Sat Dec 25 14:43:00 UTC 2010
Modified Files:
src/sys/arch/cesfic/cesfic: pmap_bootstrap.c
src/sys/arch/hp300/hp300: pmap_bootstrap.c
src/sys/arch/mvme68k/mvme68k: pmap_bootstrap.c
src/sys/arch/next68k/next68k: pmap_bootstrap.c
Log Message:
Fix fatal typo and pasted lines slipped in the last December
that prevent 68030 machines boot on these ports.
(only hp300 and mvme68k have supported 030 models)
Sorry for so long breakage.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/hp300/hp300/pmap_bootstrap.c
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/next68k/next68k/pmap_bootstrap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/cesfic/cesfic/pmap_bootstrap.c
diff -u src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.26 src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.27
--- src/sys/arch/cesfic/cesfic/pmap_bootstrap.c:1.26 Fri Dec 11 22:23:08 2009
+++ src/sys/arch/cesfic/cesfic/pmap_bootstrap.c Sat Dec 25 14:42:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.26 2009/12/11 22:23:08 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.27 2010/12/25 14:42:59 tsutsui Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.26 2009/12/11 22:23:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.27 2010/12/25 14:42:59 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -293,7 +293,7 @@
* Invalidate all remaining entries in both.
*/
este = (st_entry_t *)kstpa;
- este = &epte[TIA_SIZE];
+ este = &este[TIA_SIZE];
while (ste < este)
*ste++ = SG_NV;
epte = (pt_entry_t *)kptmpa;
Index: src/sys/arch/hp300/hp300/pmap_bootstrap.c
diff -u src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.46 src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.47
--- src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.46 Fri Dec 11 22:23:08 2009
+++ src/sys/arch/hp300/hp300/pmap_bootstrap.c Sat Dec 25 14:43:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.46 2009/12/11 22:23:08 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.47 2010/12/25 14:43:00 tsutsui Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.46 2009/12/11 22:23:08 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.47 2010/12/25 14:43:00 tsutsui Exp $");
#include <sys/param.h>
@@ -299,7 +299,7 @@
* Invalidate all remaining entries in both.
*/
este = (st_entry_t *)kstpa;
- este = &epte[TIA_SIZE];
+ este = &este[TIA_SIZE];
while (ste < este)
*ste++ = SG_NV;
epte = (pt_entry_t *)kptmpa;
Index: src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c
diff -u src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.41 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.42
--- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.41 Sun Jun 6 04:50:07 2010
+++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c Sat Dec 25 14:43:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.41 2010/06/06 04:50:07 mrg Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.42 2010/12/25 14:43:00 tsutsui Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.41 2010/06/06 04:50:07 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.42 2010/12/25 14:43:00 tsutsui Exp $");
#include <sys/param.h>
#include <sys/kcore.h>
@@ -316,7 +316,7 @@
* Invalidate all remaining entries in both.
*/
este = (st_entry_t *)kstpa;
- este = &epte[TIA_SIZE];
+ este = &este[TIA_SIZE];
while (ste < este)
*ste++ = SG_NV;
epte = (st_entry_t *)kptmpa;
Index: src/sys/arch/next68k/next68k/pmap_bootstrap.c
diff -u src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.36 src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.37
--- src/sys/arch/next68k/next68k/pmap_bootstrap.c:1.36 Sun Jun 6 04:50:08 2010
+++ src/sys/arch/next68k/next68k/pmap_bootstrap.c Sat Dec 25 14:43:00 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.36 2010/06/06 04:50:08 mrg Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.37 2010/12/25 14:43:00 tsutsui Exp $ */
/*
* This file was taken from mvme68k/mvme68k/pmap_bootstrap.c
@@ -47,7 +47,7 @@
#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.36 2010/06/06 04:50:08 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.37 2010/12/25 14:43:00 tsutsui Exp $");
#include <sys/param.h>
#include <sys/kcore.h>
@@ -326,7 +326,7 @@
* Invalidate all remaining entries in both.
*/
este = (st_entry_t *)kstpa;
- este = &epte[TIA_SIZE];
+ este = &este[TIA_SIZE];
while (ste < este)
*ste++ = SG_NV;
epte = (pt_entry_t *)kptmpa;
