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 /lib | |
| parent | 3ccdc5190f8df12dfafff9264e406c5496401da5 (diff) | |
| parent | d2279c9d7f7db7f97567368bfc4539b3411adf8d (diff) | |
| download | linux-51ccbb0ae865e153c43117e6c3244fa373ea6bd6.tar.bz2 | |
Merge branch 'for-4.16-print-symbol' into for-4.16
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/smp_processor_id.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c index 835cc6df2776..85925aaa4fff 100644 --- a/lib/smp_processor_id.c +++ b/lib/smp_processor_id.c @@ -5,7 +5,6 @@ * DEBUG_PREEMPT variant of smp_processor_id(). */ #include <linux/export.h> -#include <linux/kallsyms.h> #include <linux/sched.h> notrace static unsigned int check_preemption_disabled(const char *what1, @@ -43,7 +42,7 @@ notrace static unsigned int check_preemption_disabled(const char *what1, printk(KERN_ERR "BUG: using %s%s() in preemptible [%08x] code: %s/%d\n", what1, what2, preempt_count() - 1, current->comm, current->pid); - print_symbol("caller is %s\n", (long)__builtin_return_address(0)); + printk("caller is %pS\n", __builtin_return_address(0)); dump_stack(); out_enable: |