freebsd stable - Jul 2017 - stable/11 src update r321515 -> r321613 fail in src/usr.sbin/acpi/acpidump/

freebeast(11.1-S)[1] uname -a
FreeBSD freebeast.catwhisker.org 11.1-STABLE FreeBSD 11.1-STABLE #409 
r321515M/321515:1101501: Wed Jul 26 03:46:30 PDT 2017     root at
freebeast.catwhisker.org:/common/S1/obj/usr/src/sys/GENERIC  amd64
freebeast(11.1-S)[2] 

freebeast(11.1-S)[2] svn info /usr/src
Path: /usr/src
Working Copy Root Path: /usr/src
URL: file:///svn/freebsd/src/base/stable/11
Relative URL: ^/stable/11
Repository Root: file:///svn/freebsd/src/base
Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Revision: 321613
Node Kind: directory
Schedule: normal
Last Changed Author: mav
Last Changed Rev: 321613
Last Changed Date: 2017-07-27 03:29:29 -0700 (Thu, 27 Jul 2017)

freebeast(11.1-S)[3] 

...
--- all_subdir_usr.sbin ---
--- acpi.o ---
/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,
    ^
....


freebeast(11.1-S)[4] grep -wnr --exclude=./.svn\*
ACPI_SRAT_TYPE_GIC_ITS_AFFINITY .
./usr.sbin/acpi/acpidump/acpi.c:1089:    [ACPI_SRAT_TYPE_GIC_ITS_AFFINITY] =
"GIC ITS",
freebeast(11.1-S)[5] 


freebeast(11.1-S)[5]
^ACPI_SRAT_TYPE_GIC_ITS_AFFINITY^ACPI_SRAT_TYPE_GICC_AFFINITY
grep -wnr --exclude=./.svn\* ACPI_SRAT_TYPE_GICC_AFFINITY .
./usr.sbin/acpi/acpidump/acpi.c:1088:    [ACPI_SRAT_TYPE_GICC_AFFINITY] =
"GICC",
./usr.sbin/acpi/acpidump/acpi.c:1120:   case ACPI_SRAT_TYPE_GICC_AFFINITY:
./sys/contrib/dev/acpica/compiler/dttable2.c:1322:        case
ACPI_SRAT_TYPE_GICC_AFFINITY:
./sys/contrib/dev/acpica/include/actbl1.h:1504:    ACPI_SRAT_TYPE_GICC_AFFINITY 
= 3,
./sys/contrib/dev/acpica/common/dmtbdump.c:3496:        case
ACPI_SRAT_TYPE_GICC_AFFINITY:
freebeast(11.1-S)[6] 


Mind, I am using META_MODE, but I doubt that's at issue.

I will try the substitution clang suggests, then follow up.

Peace,
david
-- 
David H. Wolfskill				david at catwhisker.org
What kind of "investigation" would it be if it didn't "follow
the money?"

See http://www.catwhisker.org/~david/publickey.gpg for my public key.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 603 bytes
Desc: not available
URL:
<http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20170727/5fc31ce1/attachment.sig>

On Thu, Jul 27, 2017 at 04:02:12AM -0700, David Wolfskill
wrote:
> ...
> I will try the substitution clang suggests, then follow up.
> ....
That failed; following the hint from "Herbert J. Skuhra"
<herbert at mailbox.org>, I tried a cherry-pick merge of r319365.  That
seemed to get through src/usr.sbin/acpi/acpidump OK, but then failed in
zfs:

...
--- zfs.o ---
In file included from /usr/src/usr.sbin/fstyp/zfs.c:42:
In file included from /usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sy
s/vdev_impl.h:30:
In file included from /usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sy
s/dmu.h:50:
In file included from /usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sy
s/zio_compress.h:34:
/usr/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/abd.h:46:2: error: u
nknown type name 'refcount_t'
        refcount_t      abd_children;
        ^
--- all_subdir_share ---
....

So it's evident that my efforts today are not really helping; I'll
let more clueful folks figure this out.  :-)

Peace,
david
-- 
David H. Wolfskill				david at catwhisker.org
What kind of "investigation" would it be if it didn't "follow
the money?"

See http://www.catwhisker.org/~david/publickey.gpg for my public key.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 603 bytes
Desc: not available
URL:
<http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20170727/ef204c31/attachment.sig>

On 27 July 2017 at 07:02, David Wolfskill <david at catwhisker.org>
wrote:
> /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'?
Sorry about that, reverted in r321617.