1 files changed, 16 insertions, 16 deletions

diff --git a/arch/blackfin/kernel/trace.c b/arch/blackfin/kernel/trace.c
index 44bbf2f564cb..f7f7a18abca9 100644
--- a/arch/blackfin/kernel/trace.c
+++ b/arch/blackfin/kernel/trace.c
@@ -10,6 +10,8 @@
 #include <linux/hardirq.h>
 #include <linux/thread_info.h>
 #include <linux/mm.h>
+#include <linux/oom.h>
+#include <linux/sched.h>
 #include <linux/uaccess.h>
 #include <linux/module.h>
 #include <linux/kallsyms.h>
@@ -27,8 +29,7 @@ void decode_address(char *buf, unsigned long address)
 {
         struct task_struct *p;
         struct mm_struct *mm;
-        unsigned long flags, offset;
-        unsigned char in_atomic = (bfin_read_IPEND() & 0x10) || in_atomic();
+        unsigned long offset;
         struct rb_node *n;
 
 #ifdef CONFIG_KALLSYMS
@@ -112,17 +113,17 @@ void decode_address(char *buf, unsigned long address)
          * mappings of all our processes and see if we can't be a whee
          * bit more specific
          */
-        write_lock_irqsave(&tasklist_lock, flags);
+        read_lock(&tasklist_lock);
         for_each_process(p) {
-                mm = (in_atomic ? p->mm : get_task_mm(p));
-                if (!mm)
-                        continue;
+                struct task_struct *t;
 
-                if (!down_read_trylock(&mm->mmap_sem)) {
-                        if (!in_atomic)
-                                mmput(mm);
+                t = find_lock_task_mm(p);
+                if (!t)
                         continue;
-                }
+
+                mm = t->mm;
+                if (!down_read_trylock(&mm->mmap_sem))
+                        goto __continue;
 
                 for (n = rb_first(&mm->mm_rb); n; n = rb_next(n)) {
                         struct vm_area_struct *vma;
@@ -131,7 +132,7 @@ void decode_address(char *buf, unsigned long address)
 
                         if (address >= vma->vm_start && address < vma->vm_end) {
                                 char _tmpbuf[256];
-                                char *name = p->comm;
+                                char *name = t->comm;
                                 struct file *file = vma->vm_file;
 
                                 if (file) {
@@ -164,8 +165,7 @@ void decode_address(char *buf, unsigned long address)
                                                 name, vma->vm_start, vma->vm_end);
 
                                 up_read(&mm->mmap_sem);
-                                if (!in_atomic)
-                                        mmput(mm);
+                                task_unlock(t);
 
                                 if (buf[0] == '\0')
                                         sprintf(buf, "[ %s ] dynamic memory", name);
@@ -175,8 +175,8 @@ void decode_address(char *buf, unsigned long address)
                 }
 
                 up_read(&mm->mmap_sem);
-                if (!in_atomic)
-                        mmput(mm);
+__continue:
+                task_unlock(t);
         }
 
         /*
@@ -186,7 +186,7 @@ void decode_address(char *buf, unsigned long address)
         sprintf(buf, "/* kernel dynamic memory */");
 
 done:
-        write_unlock_irqrestore(&tasklist_lock, flags);
+        read_unlock(&tasklist_lock);
 }
 
 #define EXPAND_LEN ((1 << CONFIG_DEBUG_BFIN_HWTRACE_EXPAND_LEN) * 256 - 1)