Fix race between cat /proc/*/wchan and rmmod et al

[linux-2.6-block.git] / kernel / time / timer_list.c

diff --git a/kernel/time/timer_list.c b/kernel/time/timer_list.c
index fe9314a89f20c78b8df863d3011d87a1a453f9bd..b734ca4bc75e2e80814b48602df3258058c69a0b 100644 (file)
--- a/kernel/time/timer_list.c
+++ b/kernel/time/timer_list.c
@@ -38,15 +38,12 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
 
 static void print_name_offset(struct seq_file *m, void *sym)
 {
-       unsigned long addr = (unsigned long)sym;
-       char namebuf[KSYM_NAME_LEN+1];
-       const char *sym_name;
+       char symname[KSYM_NAME_LEN+1];
 
-       sym_name = kallsyms_lookup(addr, NULL, NULL, NULL, namebuf);
-       if (sym_name)
-               SEQ_printf(m, "%s", sym_name);
-       else
+       if (lookup_symbol_name((unsigned long)sym, symname) < 0)
                SEQ_printf(m, "<%p>", sym);
+       else
+               SEQ_printf(m, "%s", symname);
 }
 
 static void