Module Name: src
Committed By: jdolecek
Date: Sun Dec 9 11:12:58 UTC 2018
Modified Files:
src/sys/dev/acpi: tpm_acpi.c
Log Message:
make compile on 64-bit archs after acpi_mem ar_length was changed
from uint32_t to bus_size_t in rev. 1.77 of acpivar.h
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/tpm_acpi.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/dev/acpi/tpm_acpi.c
diff -u src/sys/dev/acpi/tpm_acpi.c:1.6 src/sys/dev/acpi/tpm_acpi.c:1.7
--- src/sys/dev/acpi/tpm_acpi.c:1.6 Thu Feb 22 01:50:26 2018
+++ src/sys/dev/acpi/tpm_acpi.c Sun Dec 9 11:12:58 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tpm_acpi.c,v 1.6 2018/02/22 01:50:26 christos Exp $ */
+/* $NetBSD: tpm_acpi.c,v 1.7 2018/12/09 11:12:58 jdolecek Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tpm_acpi.c,v 1.6 2018/02/22 01:50:26 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tpm_acpi.c,v 1.7 2018/12/09 11:12:58 jdolecek Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -156,8 +156,8 @@ tpm_acpi_attach(device_t parent, device_
if (mem->ar_length != TPM_SIZE) {
aprint_error_dev(sc->sc_dev,
- "wrong size mem %u != %u\n",
- mem->ar_length, TPM_SIZE);
+ "wrong size mem %"PRIu64" != %u\n",
+ (uint64_t)mem->ar_length, TPM_SIZE);
goto out;
}
