Merge tag 'block-5.13-2021-05-09' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / kernel / irq / debug.h

diff --git a/kernel/irq/debug.h b/kernel/irq/debug.h
index e4d3819..8ccb326 100644 (file)
--- a/kernel/irq/debug.h
+++ b/kernel/irq/debug.h
@@ -3,8 +3,6 @@
  * Debugging printout:
  */
 
-#include <linux/kallsyms.h>
-
 #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 */
@@ -19,14 +17,14 @@ static inline void print_irq_desc(unsigned int irq, struct irq_desc *desc)
 
        printk("irq %d, desc: %p, depth: %d, count: %d, unhandled: %d\n",
                irq, desc, desc->depth, desc->irq_count, desc->irqs_unhandled);
-       printk("->handle_irq():  %p, ", desc->handle_irq);
-       print_symbol("%s\n", (unsigned long)desc->handle_irq);
-       printk("->irq_data.chip(): %p, ", desc->irq_data.chip);
-       print_symbol("%s\n", (unsigned long)desc->irq_data.chip);
+       printk("->handle_irq():  %p, %pS\n",
+               desc->handle_irq, desc->handle_irq);
+       printk("->irq_data.chip(): %p, %pS\n",
+               desc->irq_data.chip, desc->irq_data.chip);
        printk("->action(): %p\n", desc->action);
        if (desc->action) {
-               printk("->action->handler(): %p, ", desc->action->handler);
-               print_symbol("%s\n", (unsigned long)desc->action->handler);
+               printk("->action->handler(): %p, %pS\n",
+                       desc->action->handler, desc->action->handler);
        }
 
        ___P(IRQ_LEVEL);