Commit 4a589e1e authored by Robin Getz's avatar Robin Getz Committed by Bryan Wu
Browse files

Blackfin arch: fix bux - only reset the PC when necessary, otherwise gdb gets confused 



Signed-off-by: default avatarRobin Getz <robin.getz@analog.com>
Signed-off-by: default avatarBryan Wu <bryan.wu@analog.com>
parent f26fbc48

arch/blackfin/kernel/traps.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -158,7 +158,7 @@ static void decode_address(char *buf, unsigned long address) 
	}

	}





	/* we were unable to find this address anywhere */

	/* we were unable to find this address anywhere */

	sprintf(buf, "[<0x%p>]", (void *)address);

	sprintf(buf, "<0x%p> /* unknown address */", (void *)address);





done:

done:

	write_unlock_irqrestore(&tasklist_lock, flags);

	write_unlock_irqrestore(&tasklist_lock, flags);
@@ -467,6 +467,7 @@ asmlinkage void trap_c(struct pt_regs *fp) 
		/* Ensure that bad return addresses don't end up in an infinite

		/* Ensure that bad return addresses don't end up in an infinite

		 * loop, due to speculative loads/reads

		 * loop, due to speculative loads/reads

		 */

		 */

		if (trapnr == VEC_CPLB_I_M)

			fp->pc = SAFE_USER_INSTRUCTION;

			fp->pc = SAFE_USER_INSTRUCTION;

	}

	}

	info.si_signo = sig;

	info.si_signo = sig;