diff -aurpN -X /home/fletch/.diff.exclude 115-ppc64_numa_sign_extn/arch/ppc64/kernel/irq.c 116-ppc64_IRQ_INPROGRESS_fix/arch/ppc64/kernel/irq.c
--- 115-ppc64_numa_sign_extn/arch/ppc64/kernel/irq.c	Thu Jan  1 21:24:45 2004
+++ 116-ppc64_IRQ_INPROGRESS_fix/arch/ppc64/kernel/irq.c	Thu Jan  1 21:30:30 2004
@@ -300,7 +300,7 @@ void enable_irq(unsigned int irq)
 	spin_lock_irqsave(&desc->lock, flags);
 	switch (desc->depth) {
 	case 1: {
-		unsigned int status = desc->status & ~(IRQ_DISABLED | IRQ_INPROGRESS);
+		unsigned int status = desc->status & ~IRQ_DISABLED;
 		desc->status = status;
 		if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
 			desc->status = status | IRQ_REPLAY;