[src/netbsd-6]: src/sys/arch/hp300/hp300 Pull up following revision(s) (reque...

[bouyer <bouyer%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/eb7d70b05fe9
branches:  netbsd-6
changeset: 776474:eb7d70b05fe9
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sun Oct 20 12:52:42 2013 +0000

description:
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.

diffstat:

 sys/arch/hp300/hp300/pmap_bootstrap.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (29 lines):

diff -r 66a0b43fdb2e -r eb7d70b05fe9 sys/arch/hp300/hp300/pmap_bootstrap.c
--- a/sys/arch/hp300/hp300/pmap_bootstrap.c     Sun Oct 20 12:51:10 2013 +0000
+++ b/sys/arch/hp300/hp300/pmap_bootstrap.c     Sun Oct 20 12:52:42 2013 +0000
@@ -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 @@
         */
        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
         */