Module Name: src
Committed By: martin
Date: Tue Oct 14 07:37:37 UTC 2014
Modified Files:
src/sys/arch/x86/x86 [netbsd-7]: pmap.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.183 -r1.183.2.1 src/sys/arch/x86/x86/pmap.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/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.183 src/sys/arch/x86/x86/pmap.c:1.183.2.1
--- src/sys/arch/x86/x86/pmap.c:1.183 Sat Jun 14 02:54:47 2014
+++ src/sys/arch/x86/x86/pmap.c Tue Oct 14 07:37:37 2014
@@ -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_get_physpage(vaddr_t va, int level,
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) */
