Module Name: src
Committed By: gutteridge
Date: Mon Dec 12 01:07:53 UTC 2022
Modified Files:
src/sys/arch/ia64/acpi: madt.c
src/sys/arch/ia64/ia64: mainbus.c
Log Message:
madt.c & mainbus.c: fix build with acpica 20221020
AcpiTbChecksum() was renamed AcpiUtChecksum() during code consolidation.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/acpi/madt.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/ia64/ia64/mainbus.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/ia64/acpi/madt.c
diff -u src/sys/arch/ia64/acpi/madt.c:1.4 src/sys/arch/ia64/acpi/madt.c:1.5
--- src/sys/arch/ia64/acpi/madt.c:1.4 Mon Apr 29 16:39:58 2019
+++ src/sys/arch/ia64/acpi/madt.c Mon Dec 12 01:07:52 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: madt.c,v 1.4 2019/04/29 16:39:58 scole Exp $ */
+/* $NetBSD: madt.c,v 1.5 2022/12/12 01:07:52 gutteridge Exp $ */
/*-
* Copyright (c) 2001 Doug Rabson
* All rights reserved.
@@ -149,7 +149,7 @@ ia64_probe_sapics(void)
if (strncmp(table->Header.Signature, ACPI_SIG_MADT,
ACPI_NAMESEG_SIZE) != 0 ||
- ACPI_FAILURE(AcpiTbChecksum((void *)table,
+ ACPI_FAILURE(AcpiUtChecksum((void *)table,
table->Header.Length)))
continue;
@@ -243,7 +243,7 @@ ia64_count_cpus(void)
if (strncmp(table->Header.Signature, ACPI_SIG_MADT,
ACPI_NAMESEG_SIZE) != 0 ||
- ACPI_FAILURE(AcpiTbChecksum((void *)table,
+ ACPI_FAILURE(AcpiUtChecksum((void *)table,
table->Header.Length)))
continue;
Index: src/sys/arch/ia64/ia64/mainbus.c
diff -u src/sys/arch/ia64/ia64/mainbus.c:1.13 src/sys/arch/ia64/ia64/mainbus.c:1.14
--- src/sys/arch/ia64/ia64/mainbus.c:1.13 Sat Aug 7 16:18:56 2021
+++ src/sys/arch/ia64/ia64/mainbus.c Mon Dec 12 01:07:52 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.13 2021/08/07 16:18:56 thorpej Exp $ */
+/* $NetBSD: mainbus.c,v 1.14 2022/12/12 01:07:52 gutteridge Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.13 2021/08/07 16:18:56 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.14 2022/12/12 01:07:52 gutteridge Exp $");
#include "acpica.h"
@@ -98,7 +98,7 @@ mainbus_attach(device_t parent, device_t
if (strncmp(sig, ACPI_SIG_MADT, ACPI_NAMESEG_SIZE) != 0)
continue;
len = table->Header.Length;
- if (ACPI_FAILURE(AcpiTbChecksum((void *)table, len)))
+ if (ACPI_FAILURE(AcpiUtChecksum((void *)table, len)))
continue;
end = (char *)table + table->Header.Length;