Re: git: 886164895f3f - main - amd64: complete thunderbolt KERNCONF integration

> On Jun 3, 2026, at 9:06 AM, Olivier Certner <olce@freebsd.org> wrote:
> 
> Hi Enji,
> 
>>> commit 886164895f3f4805dc11171ac7980acaccf6ec77
>>> Author:     Enji Cooper <ngie@FreeBSD.org>
>>> AuthorDate: 2026-06-03 06:02:01 +0000
>>> Commit:     Enji Cooper <ngie@FreeBSD.org>
>>> CommitDate: 2026-06-03 06:02:01 +0000
>>> 
>>>    amd64: complete thunderbolt KERNCONF integration
>>> 
>>>    This completes the work so the driver can be integrated into KERNCONFs
>>>    properly on amd64.
>>> 
>>>    MFC after: 1 month
>>> 
>>>    Differential Revision:  https://reviews.freebsd.org/D55573
>> 
>> /usr/src/sys/dev/thunderbolt/router.c:281:6: error: variable 'up' set but not used [-Werror,-Wunused-but-set-variable]
>> /usr/src/sys/dev/thunderbolt/router.c:723:8: error: variable 'adap' set but not used [-Werror,-Wunused-but-set-variable]
>> /usr/src/sys/dev/thunderbolt/nhi.c:837:20: error: variable 'sc' set but not used [-Werror,-Wunused-but-set-variable]
>> /usr/src/sys/dev/thunderbolt/nhi.c:871:20: error: variable 'sc' set but not used [-Werror,-Wunused-but-set-variable]
>> /usr/src/sys/dev/thunderbolt/nhi.c:874:8: error: variable 'len' set but not used [-Werror,-Wunused-but-set-variable]
>> /usr/src/sys/dev/thunderbolt/tb_acpi_pcib.c:123:15: error: variable 's' set but not used [-Werror,-Wunused-but-set-variable]
>> /usr/src/sys/dev/thunderbolt/tb_pcib.c:307:6: error: variable 'error' set but not used [-Werror,-Wunused-but-set-variable]
> 
> Compilation fails on INVARIANTS, it works with !INVARIANTS.  Was bitten by such a case relatively recently.  Try not to forget to build both cases when fiddling with debug code.
> 
> Fixed in 9a133eee1ed9cf32.  Amend as you see fit.

Thank you Olivier.

I’m kind of surprised that __diagused didn’t work, but what you did is the right thing to do in this case.

I’ll MFC your change as well when the time comes to MFC my original change.

Cheers,
-Enji