diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 2082ad489d..c58d2eb922 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -2075,7 +2075,6 @@ void do_IRQ(struct cpu_user_regs *regs) goto out_no_end; } - desc->status &= ~IRQ_REPLAY; desc->status |= IRQ_PENDING; /* diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index 64a25c96a4..38908c2a82 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -33,20 +33,15 @@ struct irqaction { #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 */ +/* 3 unused */ #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 _IRQF_SHARED 8 /* IRQ is shared */ +#define _IRQF_SHARED 6 /* IRQ is shared */ #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) #define IRQF_SHARED (1u<<_IRQF_SHARED) /* Special IRQ numbers. */