| Message ID | 1402658663-2113-1-git-send-email-stefano.stabellini@eu.citrix.com |
|---|---|
| State | New |
| Headers | show |
CC'ing Jan. Sorry I CC'ed you on the wrong patch. On Fri, 13 Jun 2014, Stefano Stabellini wrote: > Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > --- > xen/include/xen/irq.h | 24 ++++++++++++++++-------- > 1 file changed, 16 insertions(+), 8 deletions(-) > > diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h > index f2e6215..4aa1cb8 100644 > --- a/xen/include/xen/irq.h > +++ b/xen/include/xen/irq.h > @@ -19,14 +19,22 @@ struct irqaction { > /* > * IRQ line status. > */ > -#define IRQ_INPROGRESS (1u<<0) /* IRQ handler active - do not enter! */ > -#define IRQ_DISABLED (1u<<1) /* IRQ disabled - do not enter! */ > -#define IRQ_PENDING (1u<<2) /* IRQ pending - replay on enable */ > -#define IRQ_REPLAY (1u<<3) /* IRQ has been replayed but not acked yet */ > -#define IRQ_GUEST (1u<<4) /* IRQ is handled by guest OS(es) */ > -#define IRQ_MOVE_PENDING (1u<<5) /* IRQ is migrating to another CPUs */ > -#define IRQ_PER_CPU (1u<<6) /* IRQ is per CPU */ > -#define IRQ_GUEST_EOI_PENDING (1u<<7) /* IRQ was disabled, pending a guest EOI */ > +#define _IRQ_INPROGRESS 0 /* IRQ handler active - do not enter! */ > +#define _IRQ_DISABLED 1 /* IRQ disabled - do not enter! */ > +#define _IRQ_PENDING 2 /* IRQ pending - replay on enable */ > +#define _IRQ_REPLAY 3 /* IRQ has been replayed but not acked yet */ > +#define _IRQ_GUEST 4 /* IRQ is handled by guest OS(es) */ > +#define _IRQ_MOVE_PENDING 5 /* IRQ is migrating to another CPUs */ > +#define _IRQ_PER_CPU 6 /* IRQ is per CPU */ > +#define _IRQ_GUEST_EOI_PENDING 7 /* IRQ was disabled, pending a guest EOI */ > +#define IRQ_INPROGRESS (1u<<_IRQ_INPROGRESS) > +#define IRQ_DISABLED (1u<<_IRQ_DISABLED) > +#define IRQ_PENDING (1u<<_IRQ_PENDING) > +#define IRQ_REPLAY (1u<<_IRQ_REPLAY) > +#define IRQ_GUEST (1u<<_IRQ_GUEST) > +#define IRQ_MOVE_PENDING (1u<<_IRQ_MOVE_PENDING) > +#define IRQ_PER_CPU (1u<<_IRQ_PER_CPU) > +#define IRQ_GUEST_EOI_PENDING (1u<<_IRQ_GUEST_EOI_PENDING) > > /* Special IRQ numbers. */ > #define AUTO_ASSIGN_IRQ (-1) > -- > 1.7.10.4 >
>>> Stefano Stabellini <stefano.stabellini@eu.citrix.com> 06/13/14 1:27 PM >>> >CC'ing Jan. >Sorry I CC'ed you on the wrong patch. No problem, except that I don't see why you alter this for just me - this is common code, so unless you expect Ian to take care of it (who can, and who I suppose will) you should have Cc'd all "THE REST" maintainers. Jan
diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index f2e6215..4aa1cb8 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -19,14 +19,22 @@ struct irqaction { /* * IRQ line status. */ -#define IRQ_INPROGRESS (1u<<0) /* IRQ handler active - do not enter! */ -#define IRQ_DISABLED (1u<<1) /* IRQ disabled - do not enter! */ -#define IRQ_PENDING (1u<<2) /* IRQ pending - replay on enable */ -#define IRQ_REPLAY (1u<<3) /* IRQ has been replayed but not acked yet */ -#define IRQ_GUEST (1u<<4) /* IRQ is handled by guest OS(es) */ -#define IRQ_MOVE_PENDING (1u<<5) /* IRQ is migrating to another CPUs */ -#define IRQ_PER_CPU (1u<<6) /* IRQ is per CPU */ -#define IRQ_GUEST_EOI_PENDING (1u<<7) /* IRQ was disabled, pending a guest EOI */ +#define _IRQ_INPROGRESS 0 /* IRQ handler active - do not enter! */ +#define _IRQ_DISABLED 1 /* IRQ disabled - do not enter! */ +#define _IRQ_PENDING 2 /* IRQ pending - replay on enable */ +#define _IRQ_REPLAY 3 /* IRQ has been replayed but not acked yet */ +#define _IRQ_GUEST 4 /* IRQ is handled by guest OS(es) */ +#define _IRQ_MOVE_PENDING 5 /* IRQ is migrating to another CPUs */ +#define _IRQ_PER_CPU 6 /* IRQ is per CPU */ +#define _IRQ_GUEST_EOI_PENDING 7 /* IRQ was disabled, pending a guest EOI */ +#define IRQ_INPROGRESS (1u<<_IRQ_INPROGRESS) +#define IRQ_DISABLED (1u<<_IRQ_DISABLED) +#define IRQ_PENDING (1u<<_IRQ_PENDING) +#define IRQ_REPLAY (1u<<_IRQ_REPLAY) +#define IRQ_GUEST (1u<<_IRQ_GUEST) +#define IRQ_MOVE_PENDING (1u<<_IRQ_MOVE_PENDING) +#define IRQ_PER_CPU (1u<<_IRQ_PER_CPU) +#define IRQ_GUEST_EOI_PENDING (1u<<_IRQ_GUEST_EOI_PENDING) /* Special IRQ numbers. */ #define AUTO_ASSIGN_IRQ (-1)
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- xen/include/xen/irq.h | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)