Module Name: src
Committed By: tsutsui
Date: Thu Jan 6 14:19:54 UTC 2011
Modified Files:
src/sys/arch/hp300/hp300: machdep.c pmap_bootstrap.c
Log Message:
Move pmap_aliasmask initialization from pmap_bootstrap.c
to machdep.c:hp300_init() before the first pmap(9) use.
To generate a diff of this commit:
cvs rdiff -u -r1.213 -r1.214 src/sys/arch/hp300/hp300/machdep.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/hp300/hp300/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/hp300/hp300/machdep.c
diff -u src/sys/arch/hp300/hp300/machdep.c:1.213 src/sys/arch/hp300/hp300/machdep.c:1.214
--- src/sys/arch/hp300/hp300/machdep.c:1.213 Thu Jan 6 13:03:47 2011
+++ src/sys/arch/hp300/hp300/machdep.c Thu Jan 6 14:19:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.213 2011/01/06 13:03:47 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.214 2011/01/06 14:19:54 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.213 2011/01/06 13:03:47 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.214 2011/01/06 14:19:54 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_compat_netbsd.h"
@@ -221,6 +221,22 @@
extern paddr_t avail_start, avail_end;
+#ifdef CACHE_HAVE_VAC
+ /*
+ * Determine VA aliasing distance if any
+ */
+ switch (machineid) {
+ case HP_320:
+ pmap_aliasmask = 0x3fff; /* 16KB */
+ break;
+ case HP_350:
+ pmap_aliasmask = 0x7fff; /* 32KB */
+ break;
+ default:
+ break;
+ }
+#endif
+
/*
* Tell the VM system about available physical memory. The
* hp300 only has one segment.
Index: src/sys/arch/hp300/hp300/pmap_bootstrap.c
diff -u src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.53 src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.54
--- src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.53 Thu Jan 6 13:25:32 2011
+++ src/sys/arch/hp300/hp300/pmap_bootstrap.c Thu Jan 6 14:19:54 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.53 2011/01/06 13:25:32 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.54 2011/01/06 14:19:54 tsutsui Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.53 2011/01/06 13:25:32 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.54 2011/01/06 14:19:54 tsutsui Exp $");
#include <sys/param.h>
#include <uvm/uvm_extern.h>
@@ -457,18 +457,6 @@
RELOC(virtual_end, vaddr_t) = VM_MAX_KERNEL_ADDRESS;
-#ifdef M68K_MMU_HP
- /*
- * Determine VA aliasing distance if any
- */
- if (RELOC(ectype, int) == EC_VIRT) {
- if (RELOC(machineid, int) == HP_320)
- RELOC(pmap_aliasmask, int) = 0x3fff; /* 16k */
- else if (RELOC(machineid, int) == HP_350)
- RELOC(pmap_aliasmask, int) = 0x7fff; /* 32k */
- }
-#endif
-
/*
* Allocate some fixed, special purpose kernel virtual addresses
*/
