Commit 152c432b authored by Helge Deller's avatar Helge Deller Committed by Linus Torvalds

proc/wchan: use printk format instead of lookup_symbol_name()

To resolve the symbol fuction name for wchan, use the printk format
specifier %ps instead of manually looking up the symbol function name
via lookup_symbol_name().

Link: https://lkml.kernel.org/r/20201217165413.GA1959@ls3530.fritz.boxSigned-off-by: default avatarHelge Deller <deller@gmx.de>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2956f4e4
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/swap.h> #include <linux/swap.h>
#include <linux/rcupdate.h> #include <linux/rcupdate.h>
#include <linux/kallsyms.h>
#include <linux/stacktrace.h> #include <linux/stacktrace.h>
#include <linux/resource.h> #include <linux/resource.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -386,19 +385,17 @@ static int proc_pid_wchan(struct seq_file *m, struct pid_namespace *ns, ...@@ -386,19 +385,17 @@ static int proc_pid_wchan(struct seq_file *m, struct pid_namespace *ns,
struct pid *pid, struct task_struct *task) struct pid *pid, struct task_struct *task)
{ {
unsigned long wchan; unsigned long wchan;
char symname[KSYM_NAME_LEN];
if (!ptrace_may_access(task, PTRACE_MODE_READ_FSCREDS)) if (ptrace_may_access(task, PTRACE_MODE_READ_FSCREDS))
goto print0; wchan = get_wchan(task);
else
wchan = 0;
wchan = get_wchan(task); if (wchan)
if (wchan && !lookup_symbol_name(wchan, symname)) { seq_printf(m, "%ps", (void *) wchan);
seq_puts(m, symname); else
return 0; seq_putc(m, '0');
}
print0:
seq_putc(m, '0');
return 0; return 0;
} }
#endif /* CONFIG_KALLSYMS */ #endif /* CONFIG_KALLSYMS */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment