Module Name: src
Committed By: scole
Date: Mon Apr 29 16:39:58 UTC 2019
Modified Files:
src/sys/arch/ia64/acpi: madt.c
src/sys/arch/ia64/ia64: mainbus.c
Log Message:
Rename ACPI_NAME_SIZE -> ACPI_NAMESEG_SIZE with acpica update, see
src/sys/external/bsd/acpica/dist/changes.txt
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/acpi/madt.c
cvs rdiff -u -r1.10 -r1.11 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.3 src/sys/arch/ia64/acpi/madt.c:1.4
--- src/sys/arch/ia64/acpi/madt.c:1.3 Sun Apr 7 07:37:51 2013
+++ src/sys/arch/ia64/acpi/madt.c Mon Apr 29 16:39:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: madt.c,v 1.3 2013/04/07 07:37:51 kiyohara Exp $ */
+/* $NetBSD: madt.c,v 1.4 2019/04/29 16:39:58 scole Exp $ */
/*-
* Copyright (c) 2001 Doug Rabson
* All rights reserved.
@@ -148,7 +148,7 @@ ia64_probe_sapics(void)
table->Header.Signature[3], table);
if (strncmp(table->Header.Signature, ACPI_SIG_MADT,
- ACPI_NAME_SIZE) != 0 ||
+ ACPI_NAMESEG_SIZE) != 0 ||
ACPI_FAILURE(AcpiTbChecksum((void *)table,
table->Header.Length)))
continue;
@@ -242,7 +242,7 @@ ia64_count_cpus(void)
IA64_PHYS_TO_RR7(xsdt->TableOffsetEntry[t]);
if (strncmp(table->Header.Signature, ACPI_SIG_MADT,
- ACPI_NAME_SIZE) != 0 ||
+ ACPI_NAMESEG_SIZE) != 0 ||
ACPI_FAILURE(AcpiTbChecksum((void *)table,
table->Header.Length)))
continue;
Index: src/sys/arch/ia64/ia64/mainbus.c
diff -u src/sys/arch/ia64/ia64/mainbus.c:1.10 src/sys/arch/ia64/ia64/mainbus.c:1.11
--- src/sys/arch/ia64/ia64/mainbus.c:1.10 Tue Jun 21 11:33:33 2016
+++ src/sys/arch/ia64/ia64/mainbus.c Mon Apr 29 16:39:58 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: mainbus.c,v 1.10 2016/06/21 11:33:33 nonaka Exp $ */
+/* $NetBSD: mainbus.c,v 1.11 2019/04/29 16:39:58 scole Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10 2016/06/21 11:33:33 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.11 2019/04/29 16:39:58 scole Exp $");
#include "acpica.h"
@@ -95,7 +95,7 @@ mainbus_attach(device_t parent, device_t
IA64_PHYS_TO_RR7(xsdt->TableOffsetEntry[i]);
sig = table->Header.Signature;
- if (strncmp(sig, ACPI_SIG_MADT, ACPI_NAME_SIZE) != 0)
+ if (strncmp(sig, ACPI_SIG_MADT, ACPI_NAMESEG_SIZE) != 0)
continue;
len = table->Header.Length;
if (ACPI_FAILURE(AcpiTbChecksum((void *)table, len)))
