Module Name: src
Committed By: nonaka
Date: Thu Feb 9 11:56:41 UTC 2017
Modified Files:
src/sys/arch/x86/acpi: acpi_machdep.c
src/sys/arch/x86/include: efi.h
src/sys/arch/x86/x86: x86_machdep.c
Log Message:
efi_md::md_virt always uses uint64_t.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/x86/acpi/acpi_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/x86/include/efi.h
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/x86/x86/x86_machdep.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/acpi/acpi_machdep.c
diff -u src/sys/arch/x86/acpi/acpi_machdep.c:1.15 src/sys/arch/x86/acpi/acpi_machdep.c:1.16
--- src/sys/arch/x86/acpi/acpi_machdep.c:1.15 Tue Jan 24 11:09:14 2017
+++ src/sys/arch/x86/acpi/acpi_machdep.c Thu Feb 9 11:56:40 2017
@@ -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 @@ acpi_md_mcfg_validate(uint64_t addr, int
", 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
Index: src/sys/arch/x86/include/efi.h
diff -u src/sys/arch/x86/include/efi.h:1.2 src/sys/arch/x86/include/efi.h:1.3
--- src/sys/arch/x86/include/efi.h:1.2 Tue Jan 24 11:09:14 2017
+++ src/sys/arch/x86/include/efi.h Thu Feb 9 11:56:40 2017
@@ -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 @@ struct efi_md {
#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
Index: src/sys/arch/x86/x86/x86_machdep.c
diff -u src/sys/arch/x86/x86/x86_machdep.c:1.83 src/sys/arch/x86/x86/x86_machdep.c:1.84
--- src/sys/arch/x86/x86/x86_machdep.c:1.83 Thu Jan 26 01:36:35 2017
+++ src/sys/arch/x86/x86/x86_machdep.c Thu Feb 9 11:56:41 2017
@@ -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 @@ x86_parse_clusters(struct btinfo_common
", 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
