[src/trunk]: src/sys/arch/x86_64/x86_64 The mementry struct is packed by defa...

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

details:   https://anonhg.NetBSD.org/src/rev/644949bc1aa8
branches:  trunk
changeset: 543511:644949bc1aa8
user:      fvdl <fvdl%NetBSD.org@localhost>
date:      Wed Feb 26 21:32:20 2003 +0000

description:
The mementry struct is packed by default now, remove lo/hi usage.

diffstat:

 sys/arch/x86_64/x86_64/machdep.c |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (30 lines):

diff -r 073b05dce8ad -r 644949bc1aa8 sys/arch/x86_64/x86_64/machdep.c
--- a/sys/arch/x86_64/x86_64/machdep.c  Wed Feb 26 21:31:12 2003 +0000
+++ b/sys/arch/x86_64/x86_64/machdep.c  Wed Feb 26 21:32:20 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.28 2003/02/23 02:43:25 fvdl Exp $        */
+/*     $NetBSD: machdep.c,v 1.29 2003/02/26 21:32:20 fvdl Exp $        */
 
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -260,7 +260,6 @@
        }
 
        if (cpu_feature & CPUID_MTRR) {
-               mtrr_funcs = &i686_mtrr_funcs;
                i686_mtrr_init_first();
                mtrr_init_cpu(ci);
        }
@@ -1244,10 +1243,8 @@
                printf("BIOS MEMORY MAP (%d ENTRIES):\n", bim->num);
 #endif
                for (x = 0; x < bim->num; x++) {
-                       addr = ((u_int64_t)bim->entry[x].addrhi << 32) |
-                               bim->entry[x].addrlo;
-                       size = ((u_int64_t)bim->entry[x].sizehi << 32) |
-                               bim->entry[x].sizelo;
+                       addr = bim->entry[x].addr;
+                       size = bim->entry[x].size;
 #if DEBUG_MEMLOAD
                        printf("    addr 0x%lx  size 0x%lx  type 0x%x\n",
                            addr, size, bim->entry[x].type);