Module Name: src
Committed By: tsutsui
Date: Sat Dec 25 16:14:44 UTC 2010
Modified Files:
src/sys/arch/mvme68k/mvme68k: pmap_bootstrap.c
Log Message:
Put somehow missed code part in rev 1.36:
> Allocate lwp0upa (PA of lwp0 uarea) right after kernel rather than
> between other page tables to use different mappings for ste/pte pages
> as well as amiga and atari. Should resolve XXX comments in next68k and x68k.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/mvme68k/mvme68k/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/mvme68k/mvme68k/pmap_bootstrap.c
diff -u src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.43 src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.44
--- src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c:1.43 Sat Dec 25 15:29:34 2010
+++ src/sys/arch/mvme68k/mvme68k/pmap_bootstrap.c Sat Dec 25 16:14:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.43 2010/12/25 15:29:34 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.44 2010/12/25 16:14:44 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.43 2010/12/25 15:29:34 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.44 2010/12/25 16:14:44 tsutsui Exp $");
#include <sys/param.h>
#include <sys/kcore.h>
@@ -122,6 +122,9 @@
* The KVA corresponding to any of these PAs is:
* (PA - firstpa + KERNBASE).
*/
+ lwp0upa = nextpa;
+ nextpa += USPACE;
+
iiomappages = m68k_btop(RELOC(intiotop_phys, u_int) -
RELOC(intiobase_phys, u_int));
@@ -137,8 +140,6 @@
nextpa += PAGE_SIZE;
lkptpa = nextpa;
nextpa += PAGE_SIZE;
- lwp0upa = nextpa;
- nextpa += USPACE;
kptpa = nextpa;
nptpages = RELOC(Sysptsize, int) + (iiomappages + NPTEPG - 1) / NPTEPG;
nextpa += nptpages * PAGE_SIZE;
