Module Name: src
Committed By: tsutsui
Date: Sun Jan 2 05:21:11 UTC 2011
Modified Files:
src/sys/arch/hp300/hp300: pmap_bootstrap.c
src/sys/arch/m68k/include: pmap_motorola.h
src/sys/arch/m68k/m68k: pmap_motorola.c
Log Message:
Make pmap_aliasmask unsigned and declare it in <m68k/pmap_motorola.h>.
XXX: does anyone still have working HP320 or HP350 with 020+HP_MMU+VAC?
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/hp300/hp300/pmap_bootstrap.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/m68k/include/pmap_motorola.h
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/m68k/m68k/pmap_motorola.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/pmap_bootstrap.c
diff -u src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.48 src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.49
--- src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.48 Sun Jan 2 05:18:04 2011
+++ src/sys/arch/hp300/hp300/pmap_bootstrap.c Sun Jan 2 05:21:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.48 2011/01/02 05:18:04 tsutsui Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.49 2011/01/02 05:21:11 tsutsui Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.48 2011/01/02 05:18:04 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.49 2011/01/02 05:21:11 tsutsui Exp $");
#include <sys/param.h>
@@ -59,9 +59,6 @@
extern int maxmem, physmem;
extern paddr_t avail_start, avail_end;
-#ifdef M68K_MMU_HP
-extern int pmap_aliasmask;
-#endif
void pmap_bootstrap(paddr_t, paddr_t);
Index: src/sys/arch/m68k/include/pmap_motorola.h
diff -u src/sys/arch/m68k/include/pmap_motorola.h:1.30 src/sys/arch/m68k/include/pmap_motorola.h:1.31
--- src/sys/arch/m68k/include/pmap_motorola.h:1.30 Sun Jun 6 11:41:06 2010
+++ src/sys/arch/m68k/include/pmap_motorola.h Sun Jan 2 05:21:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.h,v 1.30 2010/06/06 11:41:06 he Exp $ */
+/* $NetBSD: pmap_motorola.h,v 1.31 2011/01/02 05:21:11 tsutsui Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -246,6 +246,9 @@
#if defined(M68040) || defined(M68060)
extern u_int protostfree;
#endif
+#ifdef M68K_MMU_HP
+extern u_int pmap_aliasmask;
+#endif
extern char *vmmap; /* map for mem, dumps, etc. */
extern void *CADDR1, *CADDR2;
Index: src/sys/arch/m68k/m68k/pmap_motorola.c
diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.57 src/sys/arch/m68k/m68k/pmap_motorola.c:1.58
--- src/sys/arch/m68k/m68k/pmap_motorola.c:1.57 Wed Nov 10 09:27:22 2010
+++ src/sys/arch/m68k/m68k/pmap_motorola.c Sun Jan 2 05:21:11 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.c,v 1.57 2010/11/10 09:27:22 uebayasi Exp $ */
+/* $NetBSD: pmap_motorola.c,v 1.58 2011/01/02 05:21:11 tsutsui Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@
#include "opt_m68k_arch.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.57 2010/11/10 09:27:22 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.58 2011/01/02 05:21:11 tsutsui Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -271,7 +271,7 @@
int pv_nfree;
#ifdef M68K_MMU_HP
-int pmap_aliasmask; /* seperation at which VA aliasing ok */
+u_int pmap_aliasmask; /* seperation at which VA aliasing ok */
#endif
#if defined(M68040) || defined(M68060)
u_int protostfree; /* prototype (default) free ST map */
