diff options
author | Petr Mladek <pmladek@suse.com> | 2018-01-22 10:40:50 +0100 |
---|---|---|
committer | Petr Mladek <pmladek@suse.com> | 2018-01-22 10:40:50 +0100 |
commit | 51ccbb0ae865e153c43117e6c3244fa373ea6bd6 (patch) | |
tree | 4bfa54ad5ec0542f24627971d937166960c32723 /kernel | |
parent | 3ccdc5190f8df12dfafff9264e406c5496401da5 (diff) | |
parent | d2279c9d7f7db7f97567368bfc4539b3411adf8d (diff) | |
download | linux-51ccbb0ae865e153c43117e6c3244fa373ea6bd6.tar.gz linux-51ccbb0ae865e153c43117e6c3244fa373ea6bd6.tar.bz2 linux-51ccbb0ae865e153c43117e6c3244fa373ea6bd6.zip |
Merge branch 'for-4.16-print-symbol' into for-4.16
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/irq/debug.h | 14 | ||||
-rw-r--r-- | kernel/kallsyms.c | 11 |
2 files changed, 6 insertions, 19 deletions
diff --git a/kernel/irq/debug.h b/kernel/irq/debug.h index 17f05ef8f575..7e06dd275c17 100644 --- 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 */ @@ -14,14 +12,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); diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c index 0e4c0922908a..05082eab736b 100644 --- a/kernel/kallsyms.c +++ b/kernel/kallsyms.c @@ -429,17 +429,6 @@ int sprint_backtrace(char *buffer, unsigned long address) return __sprint_symbol(buffer, address, -1, 1); } -/* Look up a kernel symbol and print it to the kernel messages. */ -void __print_symbol(const char *fmt, unsigned long address) -{ - char buffer[KSYM_SYMBOL_LEN]; - - sprint_symbol(buffer, address); - - printk(fmt, buffer); -} -EXPORT_SYMBOL(__print_symbol); - /* To avoid using get_symbol_offset for every symbol, we carry prefix along. */ struct kallsym_iter { loff_t pos; |