diff options
| author | Mike Frysinger <michael.frysinger@analog.com> | 2007-05-21 18:09:19 +0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-21 09:50:22 -0700 |
| commit | 8a0e6656030ffe9bcb81b725e956917bafc7522d (patch) | |
| tree | 3e1936b4ddffce43b29d7f44a1dca67e84b58068 | |
| parent | 678402709602a5e62bb79454f0f41bd952373300 (diff) | |
Blackfin arch: fix trace output for FLAT binaries
Signed-off-by: Mike Frysinger <michael.frysinger@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/blackfin/kernel/traps.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c index 9556b73de80..9932edee8cb 100644 --- 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; |