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: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/frv/kernel/traps.c b/arch/frv/kernel/traps.c
index 2f7e66877f3bd17c6b078d00f058f9c1959ff081..7089c2428b3f14507ffbf1e356bc59f5da81aa75 100644 (file)
--- a/arch/frv/kernel/traps.c
+++ b/arch/frv/kernel/traps.c
@@ -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: