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

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

details:   https://anonhg.NetBSD.org/src/rev/0b49f94170a0
branches:  netbsd-9
changeset: 366072:0b49f94170a0
user:      martin <martin%NetBSD.org@localhost>
date:      Fri May 13 11:10:38 2022 +0000

description:
Pull up following revision(s) (requested by bouyer in ticket #1443):

        sys/arch/x86/x86/pmap.c: revision 1.414

return after calling xen_pagezero(), don't fall back to the legacy
pmap_zero_page() method.

This should only affect performances.

diffstat:

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

diffs (30 lines):

diff -r b631ef7e3549 -r 0b49f94170a0 sys/arch/x86/x86/pmap.c
--- a/sys/arch/x86/x86/pmap.c   Wed May 04 17:52:41 2022 +0000
+++ b/sys/arch/x86/x86/pmap.c   Fri May 13 11:10:38 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pmap.c,v 1.334.2.6 2021/09/03 10:27:33 martin Exp $    */
+/*     $NetBSD: pmap.c,v 1.334.2.7 2022/05/13 11:10:38 martin Exp $    */
 
 /*
  * Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.334.2.6 2021/09/03 10:27:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.334.2.7 2022/05/13 11:10:38 martin Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -3187,8 +3187,10 @@
        pagezero(PMAP_DIRECT_MAP(pa));
 #else
 #if defined(XENPV)
-       if (XEN_VERSION_SUPPORTED(3, 4))
+       if (XEN_VERSION_SUPPORTED(3, 4)) {
                xen_pagezero(pa);
+               return;
+       }
 #endif
        struct cpu_info *ci;
        pt_entry_t *zpte;