[src/netbsd-7]: src/sys/arch/x86/x86 Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/35f34936dd1b
branches:  netbsd-7
changeset: 798428:35f34936dd1b
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Oct 14 07:37:37 2014 +0000

description:
Pull up following revision(s) (requested by bouyer in ticket #140):
        sys/arch/x86/x86/pmap.c: revision 1.184
Add a missing || defined(XEN) which cause Xen non-DIAGNOSTIC kernels
to panic at boot.

diffstat:

 sys/arch/x86/x86/pmap.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r c962b18391bd -r 35f34936dd1b sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Mon Oct 13 20:07:11 2014 +0000
+++ b/sys/arch/x86/x86/pmap.c   Tue Oct 14 07:37:37 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.183 2014/06/14 02:54:47 pgoyette Exp $      */
+/*     $NetBSD: pmap.c,v 1.183.2.1 2014/10/14 07:37:37 martin Exp $    */
 
 /*-
  * Copyright (c) 2008, 2010 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.183 2014/06/14 02:54:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.183.2.1 2014/10/14 07:37:37 martin Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -4126,7 +4126,7 @@
                pmap_pte_flush();
                pmap_update_pg((vaddr_t)early_zerop);
                memset(early_zerop, 0, PAGE_SIZE);
-#if defined(DIAGNOSTIC)
+#if defined(DIAGNOSTIC) || defined(XEN)
                pmap_pte_set(early_zero_pte, 0);
                pmap_pte_flush();
 #endif /* defined(DIAGNOSTIC) */