Re: CVS commit: [netbsd-9] src
On Fri, Oct 16, 2020 at 08:17:09AM +, Martin Husemann wrote: > Module Name: src > Committed By: martin > Date: Fri Oct 16 08:17:09 UTC 2020 > > Modified Files: > src/doc [netbsd-9]: CHANGES-9.1 > src/external/gpl2/groff/tmac [netbsd-9]: mdoc.local > src/sys/sys [netbsd-9]: param.h > > Log Message: > Welcome to 9.1! Just in case anyone is wondering - this version did not survive internal QA, we will move the tag for some files and have a slightly different 9.1 - hopefully soon. This is why no official binaries are available and there was no anouncement yet. Martin
Re: CVS commit: [netbsd-9] src/doc
On Mon, Aug 17, 2020 at 11:10:39PM +0900, Izumi Tsutsui wrote: > >> +xsrc/external/mit/xorg-server/dist/fb/fb.h1.3 > >> +xsrc/external/mit/xorg-server/dist/fb/fbfill.c1.2,1.3 > > This should be only 1.2 (no 1.3 yet). > > >> +xsrc/external/mit/xorg-server/dist/fb/fbtile.c1.1-1.3 > > Maybe only 1.3 is enough (1.2 was file removal). Both adjusted, thanks! (The scripts deal not very well with vendor branches or source changes mails referenced in commit messages) Martin
Re: CVS commit: [netbsd-9] src/doc
> Module Name: src > Committed By: martin > Date: Mon Aug 17 11:31:07 UTC 2020 > > Modified Files: > src/doc [netbsd-9]: CHANGES-9.1 > > Log Message: > Tickets #1050 - #1054 > > > To generate a diff of this commit: > cvs rdiff -u -r1.1.2.95 -r1.1.2.96 src/doc/CHANGES-9.1 >> +xsrc/external/mit/xorg-server/dist/fb/fb.h 1.3 >> +xsrc/external/mit/xorg-server/dist/fb/fbfill.c 1.2,1.3 This should be only 1.2 (no 1.3 yet). >> +xsrc/external/mit/xorg-server/dist/fb/fbtile.c 1.1-1.3 Maybe only 1.3 is enough (1.2 was file removal). >> +xsrc/external/mit/xorg-server/dist/fb/wfbrename.h 1.2 >> +external/mit/xorg/server/xorg-server/fb/Makefile.fb 1.12 --- Izumi Tsutsui
Re: CVS commit: [netbsd-9] src/sys
On Mon, Mar 09, 2020 at 02:22:26PM +0100, Tobias Nygren wrote: > /usr/src/sys/arch/amd64/amd64/trap.c: In function 'trap': > /usr/src/sys/arch/amd64/amd64/trap.c:360:2: error: expected expression before > '}' token > > 1.107 christos 356: > 1.121.2.1! martin 357: > MODULE_HOOK_CALL(amd64_oosyscall_hook, (p, frame), > ! 358:ENOSYS, hook_ret); > ! 359:if (hook_ret == 0) > 1.107 christos 360:} > 1.116 mrg 361:/* FALLTHROUGH */ > Yes, I fixed it a few minutes ago. Martin
Re: CVS commit: [netbsd-9] src/sys
On Sun, 8 Mar 2020 10:54:43 + Martin Husemann wrote: > Pull up following revision(s) (requested by pgoyette in ticket #762): > cvs rdiff -u -r1.121 -r1.121.2.1 src/sys/arch/amd64/amd64/trap.c Hi, Someone reported on IRC that this seems to have become mismerged: /usr/src/sys/arch/amd64/amd64/trap.c: In function 'trap': /usr/src/sys/arch/amd64/amd64/trap.c:360:2: error: expected expression before '}' token 1.107 christos 356: 1.121.2.1! martin 357:MODULE_HOOK_CALL(amd64_oosyscall_hook, (p, frame), ! 358:ENOSYS, hook_ret); ! 359:if (hook_ret == 0) 1.107 christos 360:} 1.116 mrg 361:/* FALLTHROUGH */
Re: CVS commit: [netbsd-9] src
On Fri, Nov 22, 2019 at 07:44:58AM +0100, Martin Husemann wrote: > On Fri, Nov 22, 2019 at 06:17:43AM +0100, Kamil Rytarowski wrote: > > Can we use __diagused? > > Yes, please - can you please commit to -current and request pullup? > Should be the same issue on HEAD (just not being noticed in default > compiles). Actually there is more fallout like this - I'll deal with it in one go. Martin
Re: CVS commit: [netbsd-9] src
On Fri, Nov 22, 2019 at 06:17:43AM +0100, Kamil Rytarowski wrote: > Can we use __diagused? Yes, please - can you please commit to -current and request pullup? Should be the same issue on HEAD (just not being noticed in default compiles). Martin
Re: CVS commit: [netbsd-9] src
On 22.11.2019 06:14, Takahiro Kambe wrote:
> In message <20191121181801.11c5ff...@cvs.netbsd.org>
> on Thu, 21 Nov 2019 18:18:01 +,
> "Martin Husemann" 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, _pic, evtchn, IST_LEVEL, level,
> +#ifdef DIAGNOSTIC
> + ih =
> +#endif
> + xen_intr_establish_xname(-1, _pic, evtchn, IST_LEVEL, level,
> xenevt_processevt, NULL, mpsafe, "xenevt");
>
> KASSERT(ih != NULL);
>
signature.asc
Description: OpenPGP digital signature
Re: CVS commit: [netbsd-9] src
In message <20191121181801.11c5ff...@cvs.netbsd.org>
on Thu, 21 Nov 2019 18:18:01 +,
"Martin Husemann" 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.
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, _pic, evtchn, IST_LEVEL, level,
+#ifdef DIAGNOSTIC
+ ih =
+#endif
+ xen_intr_establish_xname(-1, _pic, evtchn, IST_LEVEL, level,
xenevt_processevt, NULL, mpsafe, "xenevt");
KASSERT(ih != NULL);
--
Takahiro Kambe
Re: CVS commit: [netbsd-9] src
Hi, I think below commit is required, too. -- Takahiro Kambe Message-Id: <20190913051355.01263f...@cvs.netbsd.org> Subject: CVS commit: src/distrib/sets/lists/comp Date: Fri, 13 Sep 2019 05:13:54 + From: "Martin Husemann" To: source-chan...@netbsd.org Module Name:src Committed By: martin Date: Fri Sep 13 05:13:54 UTC 2019 Modified Files: src/distrib/sets/lists/comp: md.amd64 md.i386 Log Message: Add new multiboot2.h header. To generate a diff of this commit: cvs rdiff -u -r1.272 -r1.273 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.190 -r1.191 src/distrib/sets/lists/comp/md.i386 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
