Module Name: src
Committed By: bouyer
Date: Sun Oct 20 12:52:42 UTC 2013
Modified Files:
src/sys/arch/hp300/hp300 [netbsd-6]: pmap_bootstrap.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #958):
sys/arch/hp300/hp300/pmap_bootstrap.c: revision 1.58
Fix a build error on a kernel config without 68040 machines.
Reported by Andrew Gillham on port-hp300@:
http://mail-index.NetBSD.org/port-hp300/2013/09/09/msg000077.html
(I removed defined(68060) since hp300 doesn't have it)
Should be pulled up to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.57.2.1 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/pmap_bootstrap.c
diff -u src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.57 src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.57.2.1
--- src/sys/arch/hp300/hp300/pmap_bootstrap.c:1.57 Fri Feb 10 06:28:39 2012
+++ src/sys/arch/hp300/hp300/pmap_bootstrap.c Sun Oct 20 12:52:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_bootstrap.c,v 1.57 2012/02/10 06:28:39 mhitch Exp $ */
+/* $NetBSD: pmap_bootstrap.c,v 1.57.2.1 2013/10/20 12:52:42 bouyer Exp $ */
/*
* Copyright (c) 1991, 1993
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.57 2012/02/10 06:28:39 mhitch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap_bootstrap.c,v 1.57.2.1 2013/10/20 12:52:42 bouyer Exp $");
#include <sys/param.h>
#include <uvm/uvm_extern.h>
@@ -411,8 +411,10 @@ pmap_bootstrap(paddr_t nextpa, paddr_t f
*/
RELOC(Sysseg, st_entry_t *) = (st_entry_t *)(kstpa - firstpa);
RELOC(Sysseg_pa, paddr_t) = kstpa;
+#if defined(M68040)
if (RELOC(mmutype, int) == MMU_68040)
RELOC(protostfree, u_int) = stfree;
+#endif
/*
* Sysptmap: base of kernel page table map
*/
