Module Name: src
Committed By: martin
Date: Thu Sep 12 14:28:09 UTC 2019
Modified Files:
src/sys/arch/x86/acpi: acpi_machdep.c
Log Message:
Cast physical addresses via uintptr_t to ACPI_PHYSICAL_ADDRESS to deal
with all size variants of the types used here in different builds.
Patch from manu@.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/x86/acpi/acpi_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.27 src/sys/arch/x86/acpi/acpi_machdep.c:1.28
--- src/sys/arch/x86/acpi/acpi_machdep.c:1.27 Thu Sep 12 00:52:22 2019
+++ src/sys/arch/x86/acpi/acpi_machdep.c Thu Sep 12 14:28:08 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.c,v 1.27 2019/09/12 00:52:22 manu Exp $ */
+/* $NetBSD: acpi_machdep.c,v 1.28 2019/09/12 14:28:08 martin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.27 2019/09/12 00:52:22 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_machdep.c,v 1.28 2019/09/12 14:28:08 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -126,8 +126,8 @@ acpi_md_OsGetRootPointer(void)
for (i = 0; i < info->cfg.nent; i++) {
if (memcmp(&ct[i].ct_uuid,
&EFI_UUID_ACPI20, sizeof(EFI_UUID_ACPI20)) == 0) {
- PhysicalAddress =
- (ACPI_PHYSICAL_ADDRESS)ct[i].ct_data;
+ PhysicalAddress = (ACPI_PHYSICAL_ADDRESS)
+ (uintptr_t)ct[i].ct_data;
if (PhysicalAddress)
goto out;
@@ -137,8 +137,8 @@ acpi_md_OsGetRootPointer(void)
for (i = 0; i < info->cfg.nent; i++) {
if (memcmp(&ct[i].ct_uuid,
&EFI_UUID_ACPI10, sizeof(EFI_UUID_ACPI10)) == 0) {
- PhysicalAddress =
- (ACPI_PHYSICAL_ADDRESS)ct[i].ct_data;
+ PhysicalAddress = (ACPI_PHYSICAL_ADDRESS)
+ (uintptr_t)ct[i].ct_data;
if (PhysicalAddress)
goto out;
