On 22.11.2019 06:14, Takahiro Kambe wrote:
> In message <20191121181801.11C5FFA97%cvs.NetBSD.org@localhost>
> on Thu, 21 Nov 2019 18:18:01 +0000,
> "Martin Husemann" <martin%netbsd.org@localhost> wrote:
>> Module Name: src
>> Committed By: martin
>> Date: Thu Nov 21 18:18:00 UTC 2019
>>
>> Modified Files:
>> src/lib/libc [netbsd-9]: Makefile.inc
>> src/sys/arch/amd64/conf [netbsd-9]: GENERIC XEN3_DOM0 XEN3_DOMU
>> src/sys/arch/cobalt/conf [netbsd-9]: GENERIC
>> src/sys/arch/evbarm/conf [netbsd-9]: ADI_BRH ARMADAXP ARMADILLO-IOT-G3
>> ARMADILLO9 CP3100 CUBOX CUBOX-I GEMINI GEMINI_MASTER GEMINI_SLAVE
>> GENERIC.common HAWK HPT5325 IGEPV2 IMX6UL-STARTER IQ31244 IQ80310
>> IQ80321 IXDP425 LUBBOCK N900 OMAP5EVM OSK5912 PANDABOARD SMDK2800
>> TEAMASA_NPWR TEAMASA_NPWR_FC TISDP2420 TISDP2430 TS7200 TWINTAIL
>> VIPER ZAO425
>> src/sys/arch/i386/conf [netbsd-9]: GENERIC XEN3PAE_DOM0 XEN3PAE_DOMU
>> src/sys/arch/mvmeppc/conf [netbsd-9]: GENERIC
>> src/sys/arch/pmax/conf [netbsd-9]: GENERIC
>> src/sys/arch/shark/conf [netbsd-9]: GENERIC
>> src/sys/arch/sparc64/conf [netbsd-9]: GENERIC
>> src/sys/arch/zaurus/conf [netbsd-9]: GENERIC
>> src/sys/modules [netbsd-9]: Makefile.inc
>>
>> Log Message:
>> In preparation for the upcoming release, turn off DIAGNOSTIC in most
>> kernel configs, modules and libc.
> It seems to break XEN0 kernel and here is quick fix.
>
Can we use __diagused?
> diff --git a/sys/arch/xen/xen/xenevt.c b/sys/arch/xen/xen/xenevt.c
> index 61a944bc49..f46394d067 100644
> --- a/sys/arch/xen/xen/xenevt.c
> +++ b/sys/arch/xen/xen/xenevt.c
> @@ -161,7 +161,9 @@ static evtchn_port_t xenevt_alloc_event(void)
> void
> xenevtattach(int n)
> {
> +#ifdef DIAGNOSTIC
> struct intrhand *ih;
> +#endif
> int level = IPL_HIGH;
> bool mpsafe = (level != IPL_VM);
>
> @@ -183,7 +185,10 @@ xenevtattach(int n)
> evtchn_port_t evtchn = xenevt_alloc_event();
>
> /* The real objective here is to wiggle into the ih callchain for IPL level */
> - ih = xen_intr_establish_xname(-1, &xen_pic, evtchn, IST_LEVEL, level,
> +#ifdef DIAGNOSTIC
> + ih =
> +#endif
> + xen_intr_establish_xname(-1, &xen_pic, evtchn, IST_LEVEL, level,
> xenevt_processevt, NULL, mpsafe, "xenevt");
>
> KASSERT(ih != NULL);
>
Attachment:
signature.asc
Description: OpenPGP digital signature