[Xen-changelog] [xen stable-4.2] Revert "irq: Add extra debugging to help track down why an assertion is failing"

[patchbot@xxxxxxx]

commit b7fba0ebe61332ebbe671a21950cc9f83750a1f0
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Jul 1 11:55:53 2013 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Jul 1 11:55:53 2013 +0200

    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@xxxxxxxxxx>
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
    master commit: ac9e298cb4bda0238f50da814b8af2b90dc758a1
    master date: 2013-06-10 13:43:03 +0200
---
 xen/arch/x86/irq.c |   16 +---------------
 1 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index a56f7f8..f3d86a8 100644
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -623,8 +623,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;
@@ -686,19 +684,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);
             }
         }
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.2

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog