Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=4a589e1ef67fdb2d5fa783117da8dc7cba576af4
Commit:     4a589e1ef67fdb2d5fa783117da8dc7cba576af4
Parent:     f26fbc48f130962fce15f37d079968f0f272e0c2
Author:     Robin Getz <[EMAIL PROTECTED]>
AuthorDate: Mon Nov 12 22:46:46 2007 +0800
Committer:  Bryan Wu <[EMAIL PROTECTED]>
CommitDate: Mon Nov 12 22:46:46 2007 +0800

    Blackfin arch: fix bux - only reset the PC when necessary, otherwise gdb 
gets confused
    
    Signed-off-by: Robin Getz <[EMAIL PROTECTED]>
    Signed-off-by: Bryan Wu <[EMAIL PROTECTED]>
---
 arch/blackfin/kernel/traps.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c
index aaddb72..ce9981b 100644
--- a/arch/blackfin/kernel/traps.c
+++ b/arch/blackfin/kernel/traps.c
@@ -158,7 +158,7 @@ static void decode_address(char *buf, unsigned long address)
        }
 
        /* we were unable to find this address anywhere */
-       sprintf(buf, "[<0x%p>]", (void *)address);
+       sprintf(buf, "<0x%p> /* unknown address */", (void *)address);
 
 done:
        write_unlock_irqrestore(&tasklist_lock, flags);
@@ -467,7 +467,8 @@ asmlinkage void trap_c(struct pt_regs *fp)
                /* Ensure that bad return addresses don't end up in an infinite
                 * loop, due to speculative loads/reads
                 */
-               fp->pc = SAFE_USER_INSTRUCTION;
+               if (trapnr == VEC_CPLB_I_M)
+                       fp->pc = SAFE_USER_INSTRUCTION;
        }
        info.si_signo = sig;
        info.si_errno = 0;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to