r321601 causes make buildworld to fail on stable/11

[Herbert J. Skuhra]

On Thu, 27 Jul 2017, Trond Endrestøl wrote:

> r321601 gives me these error messages on stable/11:
>
> /usr/src/usr.sbin/acpi/acpidump/acpi.c:1089:6: error: use of undeclared identifier 'ACPI_SRAT_TYPE_GIC_ITS_AFFINITY'; did you mean 'ACPI_SRAT_TYPE_GICC_AFFINITY'?
>    [ACPI_SRAT_TYPE_GIC_ITS_AFFINITY] = "GIC ITS",
>     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>     ACPI_SRAT_TYPE_GICC_AFFINITY
> /usr/src/sys/contrib/dev/acpica/include/actbl1.h:1504:5: note: 'ACPI_SRAT_TYPE_GICC_AFFINITY' declared here
>    ACPI_SRAT_TYPE_GICC_AFFINITY        = 3,
>    ^
> /usr/src/usr.sbin/acpi/acpidump/acpi.c:1089:41: error: initializer overrides prior initialization of this subobject [-Werror,-Winitializer-overrides]
>    [ACPI_SRAT_TYPE_GIC_ITS_AFFINITY] = "GIC ITS",
>                                        ^~~~~~~~~
> /usr/src/usr.sbin/acpi/acpidump/acpi.c:1088:38: note: previous initialization is here
>    [ACPI_SRAT_TYPE_GICC_AFFINITY] = "GICC",
>                                     ^~~~~~
>
> Am I missing something? Am acpi.c missing something?

The following commit (or parts of it) is obviously missing on stable/11:

r319365 | jkim | 2017-06-01 02:01:19 +0200 (Thu, 01 Jun 2017) | 2 lines

Merge ACPICA 20170531.

The undeclared identifier is only available in HEAD:

     ACPI_SRAT_TYPE_GIC_ITS_AFFINITY     = 4,    /* ACPI 6.2 */

-- 
Herbert