[src/trunk]: src/sys/arch/x86 efi_md::md_virt always uses uint64_t.

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

details:   https://anonhg.NetBSD.org/src/rev/1b914b431632
branches:  trunk
changeset: 351309:1b914b431632
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Thu Feb 09 11:56:40 2017 +0000

description:
efi_md::md_virt always uses uint64_t.

diffstat:

 sys/arch/x86/acpi/acpi_machdep.c |  7 +++----
 sys/arch/x86/include/efi.h       |  4 ++--
 sys/arch/x86/x86/x86_machdep.c   |  7 +++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diffs (74 lines):

diff -r 5f3e7867f491 -r 1b914b431632 sys/arch/x86/acpi/acpi_machdep.c
--- a/sys/arch/x86/acpi/acpi_machdep.c  Thu Feb 09 11:43:32 2017 +0000
+++ b/sys/arch/x86/acpi/acpi_machdep.c  Thu Feb 09 11:56:40 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.15 2017/01/24 11:09:14 nonaka Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.16 2017/02/09 11:56:40 nonaka Exp $ */
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.15 2017/01/24 11:09:14 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.16 2017/02/09 11:56:40 nonaka Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -402,8 +402,7 @@
                            ", size=0x%016" PRIx64 ", attr=0x%016" PRIx64
                            ", type=%d(%s)\n",
                            mapaddr, mapaddr + mapsize - 1,
-                           (uint64_t)(u_long)md->md_virt,
-                           (uint64_t)(u_long)md->md_virt + mapsize - 1,
+                           md->md_virt, md->md_virt + mapsize - 1,
                            size, md->md_attr, md->md_type,
                            efi_getmemtype_str(md->md_type));
                } else
diff -r 5f3e7867f491 -r 1b914b431632 sys/arch/x86/include/efi.h
--- a/sys/arch/x86/include/efi.h        Thu Feb 09 11:43:32 2017 +0000
+++ b/sys/arch/x86/include/efi.h        Thu Feb 09 11:56:40 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: efi.h,v 1.2 2017/01/24 11:09:14 nonaka Exp $   */
+/*     $NetBSD: efi.h,v 1.3 2017/02/09 11:56:40 nonaka Exp $   */
 
 /*-
  * Copyright (c) 2004 Marcel Moolenaar
@@ -76,7 +76,7 @@
 #define        EFI_MD_TYPE_PALCODE     13      /* PAL */
        uint32_t        __pad;
        uint64_t        md_phys;
-       void            *md_virt;
+       uint64_t        md_virt;
        uint64_t        md_pages;
        uint64_t        md_attr;
 #define        EFI_MD_ATTR_UC          0x0000000000000001UL
diff -r 5f3e7867f491 -r 1b914b431632 sys/arch/x86/x86/x86_machdep.c
--- a/sys/arch/x86/x86/x86_machdep.c    Thu Feb 09 11:43:32 2017 +0000
+++ b/sys/arch/x86/x86/x86_machdep.c    Thu Feb 09 11:56:40 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: x86_machdep.c,v 1.83 2017/01/26 01:36:35 nonaka Exp $  */
+/*     $NetBSD: x86_machdep.c,v 1.84 2017/02/09 11:56:41 nonaka 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.83 2017/01/26 01:36:35 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.84 2017/02/09 11:56:41 nonaka Exp $");
 
 #include "opt_modular.h"
 #include "opt_physmem.h"
@@ -666,8 +666,7 @@
                            ", size=0x%016" PRIx64 ", attr=0x%016" PRIx64
                            ", type=%d(%s)\n",
                            addr, addr + size - 1,
-                           (uint64_t)(u_long)md->md_virt,
-                           (uint64_t)(u_long)md->md_virt + size - 1,
+                           md->md_virt, md->md_virt + size - 1,
                            size, md->md_attr, md->md_type,
                            efi_getmemtype_str(md->md_type));
 #endif