summaryrefslogtreecommitdiffstats
path: root/sys/x86
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2015-04-18 08:01:12 +0000
committerjkim <jkim@FreeBSD.org>2015-04-18 08:01:12 +0000
commitc90c234f291222de71399eb6bf3cf20dd5146286 (patch)
treeaa7f3f24f120870935af1a85c50092755374cc6e /sys/x86
parent07d63652f3a52adc1f72560c92bb639de8bffbe1 (diff)
downloadFreeBSD-src-c90c234f291222de71399eb6bf3cf20dd5146286.zip
FreeBSD-src-c90c234f291222de71399eb6bf3cf20dd5146286.tar.gz
MFC: r281396, r281475
Merge ACPICA 20150410. Relnotes: yes
Diffstat (limited to 'sys/x86')
-rw-r--r--sys/x86/acpica/OsdEnvironment.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/x86/acpica/OsdEnvironment.c b/sys/x86/acpica/OsdEnvironment.c
index 380f1bf..be612b5 100644
--- a/sys/x86/acpica/OsdEnvironment.c
+++ b/sys/x86/acpica/OsdEnvironment.c
@@ -68,7 +68,7 @@ acpi_get_root_from_loader(void)
static u_long
acpi_get_root_from_memory(void)
{
- ACPI_SIZE acpi_root;
+ ACPI_PHYSICAL_ADDRESS acpi_root;
if (ACPI_SUCCESS(AcpiFindRootPointer(&acpi_root)))
return (acpi_root);
OpenPOWER on IntegriCloud