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

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

details:   https://anonhg.NetBSD.org/src/rev/abd95a82ecf7
branches:  netbsd-10
changeset: 372758:abd95a82ecf7
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Dec 24 09:26:56 2022 +0000

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

        sys/arch/x86/x86/x86_machdep.c: revision 1.153

x86_add_cluster() takes the end of the segment, not the size.

Should fix PR port-xen/57121

diffstat:

 sys/arch/x86/x86/x86_machdep.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r d4e1e1d0b015 -r abd95a82ecf7 sys/arch/x86/x86/x86_machdep.c
--- a/sys/arch/x86/x86/x86_machdep.c    Fri Dec 23 08:10:43 2022 +0000
+++ b/sys/arch/x86/x86/x86_machdep.c    Sat Dec 24 09:26:56 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_machdep.c,v 1.152 2022/08/20 23:48:51 riastradh Exp $      */
+/*     $NetBSD: x86_machdep.c,v 1.152.4.1 2022/12/24 09:26:56 martin Exp $     */
 
 /*-
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.152 2022/08/20 23:48:51 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.152.4.1 2022/12/24 09:26:56 martin Exp $");
 
 #include "opt_modular.h"
 #include "opt_physmem.h"
@@ -870,11 +870,13 @@
                        switch (map_entry[i].type) {
                        case XEN_HVM_MEMMAP_TYPE_RAM:
                                x86_add_cluster(map_entry[i].addr,
-                                   map_entry[i].size, BIM_Memory);
+                                   map_entry[i].addr + map_entry[i].size,
+                                   BIM_Memory);
                                break;
                        case XEN_HVM_MEMMAP_TYPE_ACPI:
                                x86_add_cluster(map_entry[i].addr,
-                                   map_entry[i].size, BIM_ACPI);
+                                   map_entry[i].addr + map_entry[i].size,
+                                   BIM_ACPI);
                                break;
                        }
                }