Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f3f8e94 authored by David Howells's avatar David Howells Committed by Linus Torvalds
Browse files

FRV: Correctly determine the address of an illegal instruction 



Correctly determine the address of an illegal instruction.  The EPCR0 register
holds this value (masked by EPCR0_PC) if the validity bit is set (masked by
EPCR0_V).  So the test as to whether the contents of the register are usable
should be involve checking the _V bit, not the _PC bits.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 120dd64c

arch/frv/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ asmlinkage void illegal_instruction(unsigned long esfr1, unsigned long epcr0, un 
		      epcr0, esr0, esfr1);



	info.si_errno	= 0;

	info.si_addr	= (void *) ((epcr0 & EPCR0_PC) ? (epcr0 & EPCR0_PC) : __frame->pc);

	info.si_addr	= (void *) ((epcr0 & EPCR0_V) ? (epcr0 & EPCR0_PC) : __frame->pc);



	switch (__frame->tbr & TBR_TT) {

	case TBR_TT_ILLEGAL_INSTR: