Blackfin arch: fix trace output for FLAT binaries

[sfrench/cifs-2.6.git] / arch / blackfin / kernel / traps.c

diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index 9556b73de808541555c95cbaf6b559dc98313d2e..9932edee8cb48c4982c14c12411c37bbf84afad4 100644 (file)
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -59,9 +59,10 @@ static int printk_address(unsigned long address)
        struct vm_list_struct *vml;
        struct task_struct *p;
        struct mm_struct *mm;
+       unsigned long offset;
 
 #ifdef CONFIG_KALLSYMS
-       unsigned long offset = 0, symsize;
+       unsigned long symsize;
        const char *symname;
        char *modname;
        char *delim = ":";
@@ -106,12 +107,19 @@ static int printk_address(unsigned long address)
                                                      sizeof(_tmpbuf));
                                }
 
+                               /* FLAT does not have its text aligned to the start of
+                                * the map while FDPIC ELF does ...
+                                */
+                               if (current->mm &&
+                                   (address > current->mm->start_code) &&
+                                   (address < current->mm->end_code))
+                                       offset = address - current->mm->start_code;
+                               else
+                                       offset = (address - vma->vm_start) + (vma->vm_pgoff << PAGE_SHIFT);
+
                                write_unlock_irq(&tasklist_lock);
                                return printk("<0x%p> [ %s + 0x%lx ]",
-                                             (void*)address, name,
-                                             (unsigned long)
-                                               ((address - vma->vm_start) +
-                                                (vma->vm_pgoff << PAGE_SHIFT)));
+                                             (void*)address, name, offset);
                        }
 
                        vml = vml->next;