Merge branch 'viafb-next' of git://github.com/schandinat/linux-2.6

[~andy/linux] / kernel / irq / debug.h

diff --git a/kernel/irq/debug.h b/kernel/irq/debug.h
index d1a33b7fa61d8554e9a1cdf7188640802e47122d..97a8bfadc88a0cec4192bd457e18a54aca159cf0 100644 (file)
--- a/kernel/irq/debug.h
+++ b/kernel/irq/debug.h
@@ -4,8 +4,10 @@
 
 #include <linux/kallsyms.h>
 
-#define P(f) if (desc->status & f) printk("%14s set\n", #f)
+#define P(f) if (desc->status_use_accessors & f) printk("%14s set\n", #f)
 #define PS(f) if (desc->istate & f) printk("%14s set\n", #f)
+/* FIXME */
+#define PD(f) do { } while (0)
 
 static inline void print_irq_desc(unsigned int irq, struct irq_desc *desc)
 {
@@ -25,16 +27,19 @@ static inline void print_irq_desc(unsigned int irq, struct irq_desc *desc)
        P(IRQ_PER_CPU);
        P(IRQ_NOPROBE);
        P(IRQ_NOREQUEST);
+       P(IRQ_NOTHREAD);
        P(IRQ_NOAUTOEN);
 
        PS(IRQS_AUTODETECT);
-       PS(IRQS_INPROGRESS);
        PS(IRQS_REPLAY);
        PS(IRQS_WAITING);
-       PS(IRQS_DISABLED);
        PS(IRQS_PENDING);
-       PS(IRQS_MASKED);
+
+       PD(IRQS_INPROGRESS);
+       PD(IRQS_DISABLED);
+       PD(IRQS_MASKED);
 }
 
 #undef P
 #undef PS
+#undef PD