Date: Mon, 06 Jan 2014 07:34:10 -0700 From: Ian Lepore <ian@FreeBSD.org> To: Zbigniew Bodek <zbb@FreeBSD.org> Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org, Andreas Tobler <andreast@FreeBSD.org> Subject: Re: svn commit: r260161 - in head/sys/arm: arm include Message-ID: <1389018850.1158.333.camel@revolution.hippie.lan> In-Reply-To: <CALF_TxkhRo3MWRE2Mpsi_KjxGffJaTpOqs=1tbPTbWbUNKyK=g@mail.gmail.com> References: <201401012003.s01K3ngn009757@svn.freebsd.org> <1388976912.1158.331.camel@revolution.hippie.lan> <52CA3C07.9030002@FreeBSD.org> <CALF_TxkhRo3MWRE2Mpsi_KjxGffJaTpOqs=1tbPTbWbUNKyK=g@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, 2014-01-06 at 13:07 +0100, Zbigniew Bodek wrote: > 2014/1/6 Andreas Tobler <andreast@freebsd.org>: > > On 06.01.14 03:55, Ian Lepore wrote: > >> On Wed, 2014-01-01 at 20:03 +0000, Zbigniew Bodek wrote: > >>> Author: zbb > >>> Date: Wed Jan 1 20:03:48 2014 > >>> New Revision: 260161 > >>> URL: http://svnweb.freebsd.org/changeset/base/260161 > >>> > >>> Log: > >>> Add polarity and level support to ARM GIC > >>> > >>> Add suport for setting triggering level and polarity in GIC. > >>> New function pointer was added to nexus which corresponds > >>> to the function which sets level/sense in the hardware (GIC). > >>> > >>> Submitted by: Wojciech Macek <wma@semihalf.com> > >>> Obtained from: Semihalf > >>> > >>> Modified: > >>> head/sys/arm/arm/gic.c > >>> head/sys/arm/arm/intr.c > >>> head/sys/arm/arm/nexus.c > >>> head/sys/arm/include/intr.h > >>> > >> [...] > >>> Modified: head/sys/arm/include/intr.h > >>> ============================================================================== > >>> --- head/sys/arm/include/intr.h Wed Jan 1 19:38:15 2014 (r260160) > >>> +++ head/sys/arm/include/intr.h Wed Jan 1 20:03:48 2014 (r260161) > >>> @@ -68,6 +68,7 @@ > >>> #endif > >>> > >>> #include <machine/psl.h> > >>> +#include <sys/bus.h> > >>> > >>> int arm_get_next_irq(int); > >>> void arm_mask_irq(uintptr_t); > >>> @@ -77,6 +78,8 @@ void arm_setup_irqhandler(const char *, > >>> void *, int, int, void **); > >>> int arm_remove_irqhandler(int, void *); > >>> extern void (*arm_post_filter)(void *); > >>> +extern int (*arm_config_irq)(int irq, enum intr_trigger trig, > >>> + enum intr_polarity pol); > >>> > >>> void gic_init_secondary(void); > >>> > >> > >> It turns out that the new #include in this change is causing the current > >> arm tinderbox failures. Enums can't have forward decls anymore, so the > >> fix for this may not be easy. > > > > I posted my try to fix this here: > > > > http://lists.freebsd.org/pipermail/freebsd-current/2014-January/047694.html > > > > Rebuilt 260333 successfully with it. > > > > Andreas > > > > Hello. > > Thank you very much. Can this be committed or are there any objections? > > Best regards > zbb It looks good to me. It's odd that the tinderbox has been failing for several days on this, but I've been doing universe-kernel builds all weekend without running into it. I wonder what's different between tinderbox and universe in this regard? -- Ian
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1389018850.1158.333.camel>