Revert "irq: Add extra debugging to help track down why an assertion is failing"

This reverts commits 2ae8b9173fb2388af6514c730d620ed5f450bc34 and
98e10364bde098e12104caa4f566b17d05f8b791.

This was never reported to be hit, and we assume to have taken care of
the problem by excluding legacy IRQs from the IRQ move cleanup logic.

Suggested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: George Dunlap <george.dunlap@eu.citrix.com>

diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index 699221ae990d084d8716a6aeb41fe205ffcdf9f5..a4da7868cbb43a03e7ead84529bec83c9e699c1d 100644 (file)
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -624,8 +624,6 @@ void move_native_irq(struct irq_desc *desc)
     desc->handler->enable(desc);
 }
 
-static void dump_irqs(unsigned char key);
-
 void irq_move_cleanup_interrupt(struct cpu_user_regs *regs)
 {
     unsigned vector, me;
@@ -687,19 +685,7 @@ void irq_move_cleanup_interrupt(struct cpu_user_regs *regs)
 
             if ( desc->arch.used_vectors )
             {
-                if ( unlikely(!test_bit(vector, desc->arch.used_vectors)) )
-                {
-                    spin_unlock(&desc->lock);
-                    bitmap_scnlistprintf(keyhandler_scratch,
-                                         sizeof(keyhandler_scratch),
-                                         desc->arch.used_vectors->_bits,
-                                         NR_VECTORS);
-                    printk("*** IRQ BUG found ***\n"
-                           "CPU%d -Testing vector %d from bitmap %s\n",
-                           me, vector, keyhandler_scratch);
-                    dump_irqs('i');
-                    BUG();
-                }
+                ASSERT(test_bit(vector, desc->arch.used_vectors));
                 clear_bit(vector, desc->arch.used_vectors);
             }
         }